diff --git a/.travis.yml b/.travis.yml index 9ec2f724b..c6a7cd5c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,50 +12,10 @@ before_script: matrix: include: - - python: "2.7" - env: TOXENV=py27_install BOULDER_INTEGRATION=v1 - sudo: required - services: docker - python: "2.7" env: TOXENV=py27_install BOULDER_INTEGRATION=v2 sudo: required services: docker - - python: "2.7" - env: TOXENV=cover FYI="this also tests py27" - - sudo: required - env: TOXENV=nginx_compat - services: docker - before_install: - addons: - - python: "2.7" - env: TOXENV=lint - - python: "2.7" - env: TOXENV='py27-{acme,apache,certbot,dns,nginx}-oldest' - sudo: required - services: docker - - python: "3.4" - env: TOXENV=py34 - sudo: required - services: docker - - python: "3.6" - env: TOXENV=py36 - sudo: required - services: docker - - sudo: required - env: TOXENV=apache_compat - services: docker - before_install: - addons: - - sudo: required - env: TOXENV=le_auto_trusty - services: docker - before_install: - addons: - - python: "2.7" - env: TOXENV=apacheconftest - sudo: required - - python: "2.7" - env: TOXENV=nginxroundtrip # Only build pushes to the master branch, PRs, and branches beginning with @@ -100,9 +60,3 @@ after_success: '[ "$TOXENV" == "cover" ] && coveralls' notifications: email: false - irc: - channels: - - secure: "SGWZl3ownKx9xKVV2VnGt7DqkTmutJ89oJV9tjKhSs84kLijU6EYdPnllqISpfHMTxXflNZuxtGo0wTDYHXBuZL47w1O32W6nzuXdra5zC+i4sYQwYULUsyfOv9gJX8zWAULiK0Z3r0oho45U+FR5ZN6TPCidi8/eGU+EEPwaAw=" - on_success: never - on_failure: always - use_notice: true diff --git a/tests/boulder-integration.sh b/tests/boulder-integration.sh index f2b0dcf60..5730eda19 100755 --- a/tests/boulder-integration.sh +++ b/tests/boulder-integration.sh @@ -433,7 +433,8 @@ done # Test ACMEv2-only features if [ "${BOULDER_INTEGRATION:-v1}" = "v2" ]; then common -a manual -d '*.le4.wtf,le4.wtf' --preferred-challenges dns \ - --manual-auth-hook ./tests/manual-dns-auth.sh + --manual-auth-hook ./tests/manual-dns-auth.sh \ + --manual-cleanup-hook ./tests/manual-dns-cleanup.sh fi # Most CI systems set this variable to true. diff --git a/tests/manual-dns-cleanup.sh b/tests/manual-dns-cleanup.sh new file mode 100755 index 000000000..0c5c56b17 --- /dev/null +++ b/tests/manual-dns-cleanup.sh @@ -0,0 +1,3 @@ +#!/bin/sh +curl -X POST 'http://localhost:8055/clear-txt' -d \ + "{\"host\": \"_acme-challenge.$CERTBOT_DOMAIN.\"}"