From 2ec660c72935f18287a35a07c1af287b08df7039 Mon Sep 17 00:00:00 2001 From: Pieter Lexis Date: Fri, 23 Jun 2017 10:43:37 +0200 Subject: [PATCH] Travis: Use auth 4.0 for recursor tests (cherry picked from commit dad54543abf80aedefbe47f1d538542763794173) --- build-scripts/travis.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/build-scripts/travis.sh b/build-scripts/travis.sh index 2538b8b6a..00a92075a 100755 --- a/build-scripts/travis.sh +++ b/build-scripts/travis.sh @@ -329,18 +329,17 @@ install_recursor() { run "sudo apt-get -qq --no-install-recommends install \ authbind \ daemontools \ - libbotan-1.10-0 \ libfaketime \ - liblua5.2-0 \ moreutils \ jq" run "cd .." - run "wget http://s3.amazonaws.com/alexa-static/top-1m.csv.zip" - run "unzip top-1m.csv.zip -d ./pdns/regression-tests" - PDNS_SERVER_VERSION="0.0.880gcb54743-1pdns" - run "wget https://downloads.powerdns.com/autobuilt/auth/deb/$PDNS_SERVER_VERSION.trusty-amd64/pdns-server_$PDNS_SERVER_VERSION.trusty_amd64.deb" - run "wget https://downloads.powerdns.com/autobuilt/auth/deb/$PDNS_SERVER_VERSION.trusty-amd64/pdns-tools_$PDNS_SERVER_VERSION.trusty_amd64.deb" - run "sudo dpkg -i pdns-server_$PDNS_SERVER_VERSION.trusty_amd64.deb pdns-tools_$PDNS_SERVER_VERSION.trusty_amd64.deb" + run "wget https://s3.amazonaws.com/alexa-static/top-1m.csv.zip" + run "unzip top-1m.csv.zip -d ${TRAVIS_BUILD_DIR}/regression-tests" + run 'echo -e "deb [arch=amd64] http://repo.powerdns.com/ubuntu trusty-auth-40 main" | sudo tee /etc/apt/sources.list.d/pdns.list' + run 'echo -e "Package: pdns-*\nPin: origin PowerDNS\nPin-Priority: 600" | sudo tee /etc/apt/preferences.d/pdns.list' + run 'curl https://repo.powerdns.com/FD380FBB-pub.asc | sudo apt-key add - ' + run 'sudo apt-get update' + run 'sudo apt-get -y install pdns-server pdns-tools' run "sudo service pdns stop" run 'for suffix in {1..40}; do sudo /sbin/ip addr add 10.0.3.$suffix/32 dev lo; done' run "sudo touch /etc/authbind/byport/53" -- 2.40.0