From 0ec21334c3add0e3e7d345da11ce438797bf40df Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Sat, 2 Feb 2019 16:36:47 +0100 Subject: travis-ci: Switch over to xenial --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 712f2475..dce12f56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ sudo: required -dist: trusty +dist: xenial language: c env: -- cgit v1.2.3-74-g34f1 From a8d96ce2c6bd5ed10b77ac0fe4cb6979c7027e19 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Sat, 2 Feb 2019 16:47:07 +0100 Subject: travis-ci: Remove backports ppa --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dce12f56..d7716fa3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,6 @@ before_install: - "sudo killall -9 ntpd ||:" # Trusty has no swap, lets create some - sudo fallocate -l 20M /swapfile; sudo chmod 600 /swapfile; sudo mkswap /swapfile; sudo swapon /swapfile - - sudo add-apt-repository -y ppa:waja/trusty-backports - sudo apt-get update -qq - sudo apt-get purge -qq gawk -- cgit v1.2.3-74-g34f1 From 0ca6c28ebfcf647b72ec2f62a75ef846aad58754 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Sat, 2 Feb 2019 16:52:08 +0100 Subject: travis-ci: The package name is now 'squid' --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d7716fa3..43e8ee87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,7 +51,7 @@ install: - sudo apt-get install -qq --no-install-recommends autoconf automake - sudo apt-get install -qq --no-install-recommends faketime - sudo apt-get install -qq --no-install-recommends libmonitoring-plugin-perl - - sudo apt-get install -qq --no-install-recommends squid3 + - sudo apt-get install -qq --no-install-recommends squid # Trusty related dependencies (not yet provided) - 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 # enable ssl apache @@ -59,8 +59,8 @@ install: - sudo a2ensite default-ssl - sudo make-ssl-cert generate-default-snakeoil --force-overwrite - sudo service apache2 reload - - sudo cp tools/squid.conf /etc/squid3/squid.conf - - sudo service squid3 reload + - sudo cp tools/squid.conf /etc/squid/squid.conf + - sudo service squid reload before_script: # ensure we have a test database in place for tests -- cgit v1.2.3-74-g34f1 From 2416aaadd879caae33438e09f6d2eeffdb5434c2 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Sat, 2 Feb 2019 17:26:01 +0100 Subject: travis-ci: Restart mysql --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 43e8ee87..134d2189 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,6 +61,7 @@ install: - sudo service apache2 reload - sudo cp tools/squid.conf /etc/squid/squid.conf - sudo service squid reload + - sudo service mysql restart before_script: # ensure we have a test database in place for tests -- cgit v1.2.3-74-g34f1 From 2dcfbbcad03baf1124644184ec072ac0dba024f7 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Mon, 4 Feb 2019 14:24:29 +0100 Subject: travis-ci: Use RSA keys for SSH tests --- .travis.yml | 4 ++-- plugins/t/NPTest.cache.travis | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 134d2189..946345c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,8 +73,8 @@ before_script: - make - export NPTEST_ACCEPTDEFAULT=1 - export NPTEST_CACHE="$(pwd)/plugins/t/NPTest.cache.travis" - - ssh-keygen -t dsa -N "" -f ~/.ssh/id_dsa - - cat ~/.ssh/id_dsa.pub >> ~/.ssh/authorized_keys + - ssh-keygen -t rsa -N "" -f ~/.ssh/id_rsa + - cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys - ssh-keyscan localhost >> ~/.ssh/known_hosts - touch ~/.ssh/config - 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 6ee45053..9b9f8059 100644 --- a/plugins/t/NPTest.cache.travis +++ b/plugins/t/NPTest.cache.travis @@ -50,5 +50,5 @@ 'NP_SNMP_USER' => '', 'NP_SSH_CONFIGFILE' => '~/.ssh/config', 'NP_SSH_HOST' => 'localhost', - 'NP_SSH_IDENTITY' => '~/.ssh/id_dsa' + 'NP_SSH_IDENTITY' => '~/.ssh/id_rsa' } -- cgit v1.2.3-74-g34f1