diff --git a/tests/letstest/azure-setup.sh b/tests/letstest/azure-setup.sh deleted file mode 100644 index 9817ce853..000000000 --- a/tests/letstest/azure-setup.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -ex -# -# Preps the test farm tests to be run in Travis. - -if [ "$BUILD_REASON" = "PullRequest" ]; then - echo This script must be run in Azure on a non-pull request build - exit 1 -fi - -openssl aes-256-cbc -K "${FARMTEST_SECURE_KEY}" -iv "${FARMTEST_SECURE_IV}" -in azure-test-farm.pem.enc -out azure-test-farm.pem -d diff --git a/tests/letstest/azure-test-farm.pem.enc b/tests/letstest/azure-test-farm.pem.enc deleted file mode 100644 index f8b1d576c..000000000 Binary files a/tests/letstest/azure-test-farm.pem.enc and /dev/null differ diff --git a/tox.ini b/tox.ini index 17273ae7e..829790e55 100644 --- a/tox.ini +++ b/tox.ini @@ -285,49 +285,37 @@ setenv = {[testenv:py27-oldest]setenv} [testenv:azure-test-farm-tests-base] changedir = tests/letstest -commands = - ./azure-setup.sh deps = -rtests/letstest/requirements.txt passenv = AWS_* SYSTEM_DEFAULTWORKINGDIRECTORY BUILD_SOURCEBRANCHNAME - FARMTEST_SECURE_KEY - FARMTEST_SECURE_IV setenv = AWS_DEFAULT_REGION=us-east-1 [testenv:azure-test-farm-apache2] changedir = {[testenv:azure-test-farm-tests-base]changedir} -commands = - {[testenv:azure-test-farm-tests-base]commands} - python multitester.py apache2_targets.yaml azure-test-farm.pem SET_BY_ENV scripts/test_apache2.sh --repo {env:SYSTEM_DEFAULTWORKINGDIRECTORY} --branch {env:BUILD_SOURCEBRANCHNAME} +commands = python multitester.py apache2_targets.yaml azure-test-farm.pem SET_BY_ENV scripts/test_apache2.sh --repo {env:SYSTEM_DEFAULTWORKINGDIRECTORY} --branch {env:BUILD_SOURCEBRANCHNAME} deps = {[testenv:azure-test-farm-tests-base]deps} passenv = {[testenv:azure-test-farm-tests-base]passenv} setenv = {[testenv:azure-test-farm-tests-base]setenv} [testenv:azure-test-farm-leauto-upgrades] changedir = {[testenv:azure-test-farm-tests-base]changedir} -commands = - {[testenv:azure-test-farm-tests-base]commands} - python multitester.py targets.yaml azure-test-farm.pem SET_BY_ENV scripts/test_leauto_upgrades.sh --repo {env:SYSTEM_DEFAULTWORKINGDIRECTORY} --branch {env:BUILD_SOURCEBRANCHNAME} +commands = python multitester.py targets.yaml azure-test-farm.pem SET_BY_ENV scripts/test_leauto_upgrades.sh --repo {env:SYSTEM_DEFAULTWORKINGDIRECTORY} --branch {env:BUILD_SOURCEBRANCHNAME} deps = {[testenv:azure-test-farm-tests-base]deps} passenv = {[testenv:azure-test-farm-tests-base]passenv} setenv = {[testenv:azure-test-farm-tests-base]setenv} [testenv:azure-test-farm-certonly-standalone] changedir = {[testenv:azure-test-farm-tests-base]changedir} -commands = - {[testenv:azure-test-farm-tests-base]commands} - python multitester.py targets.yaml azure-test-farm.pem SET_BY_ENV scripts/test_letsencrypt_auto_certonly_standalone.sh --repo {env:SYSTEM_DEFAULTWORKINGDIRECTORY} --branch {env:BUILD_SOURCEBRANCHNAME} +commands = python multitester.py targets.yaml azure-test-farm.pem SET_BY_ENV scripts/test_letsencrypt_auto_certonly_standalone.sh --repo {env:SYSTEM_DEFAULTWORKINGDIRECTORY} --branch {env:BUILD_SOURCEBRANCHNAME} deps = {[testenv:azure-test-farm-tests-base]deps} passenv = {[testenv:azure-test-farm-tests-base]passenv} setenv = {[testenv:azure-test-farm-tests-base]setenv} [testenv:azure-test-farm-sdists] changedir = {[testenv:azure-test-farm-tests-base]changedir} -commands = - {[testenv:azure-test-farm-tests-base]commands} - python multitester.py targets.yaml azure-test-farm.pem SET_BY_ENV scripts/test_sdists.sh --repo {env:SYSTEM_DEFAULTWORKINGDIRECTORY} --branch {env:BUILD_SOURCEBRANCHNAME} +commands = python multitester.py targets.yaml azure-test-farm.pem SET_BY_ENV scripts/test_sdists.sh --repo {env:SYSTEM_DEFAULTWORKINGDIRECTORY} --branch {env:BUILD_SOURCEBRANCHNAME} deps = {[testenv:azure-test-farm-tests-base]deps} passenv = {[testenv:azure-test-farm-tests-base]passenv} setenv = {[testenv:azure-test-farm-tests-base]setenv}