summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Wagner <waja@cyconet.org>2019-02-06 07:34:44 (GMT)
committerJan Wagner <waja@cyconet.org>2019-02-06 07:34:44 (GMT)
commit49a0583bffe03617ad91c17dc7a6465a10c8ccdd (patch)
tree9653a0d7aa6d65e24e090b6efb4edcae67b9e1fe
parentda02bfe3cad7ba8fd61cbc0a30c5f37ab9bf2c7b (diff)
parent2dcfbbcad03baf1124644184ec072ac0dba024f7 (diff)
downloadmonitoring-plugins-49a0583bffe03617ad91c17dc7a6465a10c8ccdd.tar.gz
Merge branch 'travis-ci-xenial'
-rw-r--r--.travis.yml14
-rw-r--r--plugins/t/NPTest.cache.travis2
2 files changed, 8 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 712f247..946345c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
1sudo: required 1sudo: required
2dist: trusty 2dist: xenial
3language: c 3language: c
4 4
5env: 5env:
@@ -39,7 +39,6 @@ before_install:
39 - "sudo killall -9 ntpd ||:" 39 - "sudo killall -9 ntpd ||:"
40 # Trusty has no swap, lets create some 40 # Trusty has no swap, lets create some
41 - sudo fallocate -l 20M /swapfile; sudo chmod 600 /swapfile; sudo mkswap /swapfile; sudo swapon /swapfile 41 - sudo fallocate -l 20M /swapfile; sudo chmod 600 /swapfile; sudo mkswap /swapfile; sudo swapon /swapfile
42 - sudo add-apt-repository -y ppa:waja/trusty-backports
43 - sudo apt-get update -qq 42 - sudo apt-get update -qq
44 - sudo apt-get purge -qq gawk 43 - sudo apt-get purge -qq gawk
45 44
@@ -52,7 +51,7 @@ install:
52 - sudo apt-get install -qq --no-install-recommends autoconf automake 51 - sudo apt-get install -qq --no-install-recommends autoconf automake
53 - sudo apt-get install -qq --no-install-recommends faketime 52 - sudo apt-get install -qq --no-install-recommends faketime
54 - sudo apt-get install -qq --no-install-recommends libmonitoring-plugin-perl 53 - sudo apt-get install -qq --no-install-recommends libmonitoring-plugin-perl
55 - sudo apt-get install -qq --no-install-recommends squid3 54 - sudo apt-get install -qq --no-install-recommends squid
56 # Trusty related dependencies (not yet provided) 55 # Trusty related dependencies (not yet provided)
57 - test "$(dpkg -l | grep -E "mysql-(client|server)-[0-9].[0-9]" | grep -c ^ii)" -gt 0 || sudo apt-get install -qq --no-install-recommends mariadb-client mariadb-server 56 - test "$(dpkg -l | grep -E "mysql-(client|server)-[0-9].[0-9]" | grep -c ^ii)" -gt 0 || sudo apt-get install -qq --no-install-recommends mariadb-client mariadb-server
58 # enable ssl apache 57 # enable ssl apache
@@ -60,8 +59,9 @@ install:
60 - sudo a2ensite default-ssl 59 - sudo a2ensite default-ssl
61 - sudo make-ssl-cert generate-default-snakeoil --force-overwrite 60 - sudo make-ssl-cert generate-default-snakeoil --force-overwrite
62 - sudo service apache2 reload 61 - sudo service apache2 reload
63 - sudo cp tools/squid.conf /etc/squid3/squid.conf 62 - sudo cp tools/squid.conf /etc/squid/squid.conf
64 - sudo service squid3 reload 63 - sudo service squid reload
64 - sudo service mysql restart
65 65
66before_script: 66before_script:
67 # ensure we have a test database in place for tests 67 # ensure we have a test database in place for tests
@@ -73,8 +73,8 @@ before_script:
73 - make 73 - make
74 - export NPTEST_ACCEPTDEFAULT=1 74 - export NPTEST_ACCEPTDEFAULT=1
75 - export NPTEST_CACHE="$(pwd)/plugins/t/NPTest.cache.travis" 75 - export NPTEST_CACHE="$(pwd)/plugins/t/NPTest.cache.travis"
76 - ssh-keygen -t dsa -N "" -f ~/.ssh/id_dsa 76 - ssh-keygen -t rsa -N "" -f ~/.ssh/id_rsa
77 - cat ~/.ssh/id_dsa.pub >> ~/.ssh/authorized_keys 77 - cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
78 - ssh-keyscan localhost >> ~/.ssh/known_hosts 78 - ssh-keyscan localhost >> ~/.ssh/known_hosts
79 - touch ~/.ssh/config 79 - touch ~/.ssh/config
80 - sudo rm -f /usr/share/mibs/ietf/SNMPv2-PDU /usr/share/mibs/ietf/IPSEC-SPD-MIB /usr/share/mibs/ietf/IPATM-IPMC-MIB /usr/share/mibs/iana/IANA-IPPM-METRICS-REGISTRY-MIB 80 - sudo rm -f /usr/share/mibs/ietf/SNMPv2-PDU /usr/share/mibs/ietf/IPSEC-SPD-MIB /usr/share/mibs/ietf/IPATM-IPMC-MIB /usr/share/mibs/iana/IANA-IPPM-METRICS-REGISTRY-MIB
diff --git a/plugins/t/NPTest.cache.travis b/plugins/t/NPTest.cache.travis
index 6ee4505..9b9f805 100644
--- a/plugins/t/NPTest.cache.travis
+++ b/plugins/t/NPTest.cache.travis
@@ -50,5 +50,5 @@
50 'NP_SNMP_USER' => '', 50 'NP_SNMP_USER' => '',
51 'NP_SSH_CONFIGFILE' => '~/.ssh/config', 51 'NP_SSH_CONFIGFILE' => '~/.ssh/config',
52 'NP_SSH_HOST' => 'localhost', 52 'NP_SSH_HOST' => 'localhost',
53 'NP_SSH_IDENTITY' => '~/.ssh/id_dsa' 53 'NP_SSH_IDENTITY' => '~/.ssh/id_rsa'
54} 54}