diff --git a/.travis.yml b/.travis.yml index b38274ec6..e9757d3b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -96,7 +96,7 @@ matrix: # Extended test suite on cron jobs and pushes to tested branches other than master - python: "2.7" env: - - TOXENV=travis-test-farm-tests + - TOXENV=travis-test-apache2 - secure: "f+j/Lj9s1lcuKo5sEFrlRd1kIAMnIJI4z0MTI7QF8jl9Fkmbx7KECGzw31TNgzrOSzxSapHbcueFYvNCLKST+kE/8ogMZBbwqXfEDuKpyF6BY3uYoJn+wPVE5pIb8Hhe08xPte8TTDSMIyHI3EyTfcAKrIreauoArePvh/cRvSw=" <<: *extended-test-suite - python: "3.7" diff --git a/tox.ini b/tox.ini index 8a6a33226..d19867cef 100644 --- a/tox.ini +++ b/tox.ini @@ -275,10 +275,21 @@ commands = passenv = DOCKER_* setenv = {[testenv:py27-oldest]setenv} -[testenv:travis-test-farm-tests] -commands = {toxinidir}/tests/letstest/travis.sh +[testenv:travis-test-farm-tests-base] +changedir = tests/letstest +commands = + openssl aes-256-cbc -K {env:encrypted_9a387195a62e_key} -iv {env:encrypted_9a387195a62e_iv} -in travis-test-farm.pem.enc -out travis-test-farm.pem -d deps = -rtests/letstest/requirements.txt -passenv = - AWS_* - encrypted_* +passenv = AWS_* setenv = AWS_DEFAULT_REGION=us-east-1 +whitelist_externals = openssl + +[testenv:travis-test-apache2] +changedir = {[testenv:travis-test-farm-tests-base]changedir} +commands = + {[testenv:travis-test-farm-tests-base]commands} + python multitester.py apache2_targets.yaml ./travis-test-farm.pem none scripts/test_apache2.sh +deps = {[testenv:travis-test-farm-tests-base]deps} +passenv = {[testenv:travis-test-farm-tests-base]passenv} +setenv = {[testenv:travis-test-farm-tests-base]setenv} +whitelist_externals = {[testenv:travis-test-farm-tests-base]whitelist_externals}