Merge branch 'travis-test-farm' into test-letstest-all-changes2-fast2

This commit is contained in:
Brad Warren 2019-05-16 12:55:26 -07:00
commit 06874de903
3 changed files with 43 additions and 14 deletions

View file

@ -34,6 +34,18 @@ matrix:
env:
- TOXENV=travis-test-apache2
- secure: "f+j/Lj9s1lcuKo5sEFrlRd1kIAMnIJI4z0MTI7QF8jl9Fkmbx7KECGzw31TNgzrOSzxSapHbcueFYvNCLKST+kE/8ogMZBbwqXfEDuKpyF6BY3uYoJn+wPVE5pIb8Hhe08xPte8TTDSMIyHI3EyTfcAKrIreauoArePvh/cRvSw="
- python: "2.7"
env:
- TOXENV=travis-test-leauto-upgrades
- secure: "f+j/Lj9s1lcuKo5sEFrlRd1kIAMnIJI4z0MTI7QF8jl9Fkmbx7KECGzw31TNgzrOSzxSapHbcueFYvNCLKST+kE/8ogMZBbwqXfEDuKpyF6BY3uYoJn+wPVE5pIb8Hhe08xPte8TTDSMIyHI3EyTfcAKrIreauoArePvh/cRvSw="
- python: "2.7"
env:
- TOXENV=travis-test-letsencrypt-auto-certonly-standalone
- secure: "f+j/Lj9s1lcuKo5sEFrlRd1kIAMnIJI4z0MTI7QF8jl9Fkmbx7KECGzw31TNgzrOSzxSapHbcueFYvNCLKST+kE/8ogMZBbwqXfEDuKpyF6BY3uYoJn+wPVE5pIb8Hhe08xPte8TTDSMIyHI3EyTfcAKrIreauoArePvh/cRvSw="
- python: "2.7"
env:
- TOXENV=travis-test-sdists
- secure: "f+j/Lj9s1lcuKo5sEFrlRd1kIAMnIJI4z0MTI7QF8jl9Fkmbx7KECGzw31TNgzrOSzxSapHbcueFYvNCLKST+kE/8ogMZBbwqXfEDuKpyF6BY3uYoJn+wPVE5pIb8Hhe08xPte8TTDSMIyHI3EyTfcAKrIreauoArePvh/cRvSw="
# container-based infrastructure
sudo: false

View file

@ -1,13 +0,0 @@
#!/bin/bash -eux
#
# Runs test farm tests in Travis.
cd $(dirname "$0")
openssl aes-256-cbc -K $encrypted_9a387195a62e_key -iv $encrypted_9a387195a62e_iv -in travis-test-farm.pem.enc -out travis-test-farm.pem -d
python multitester.py apache2_targets.yaml ./travis-test-farm.pem none scripts/test_apache2.sh
for script in test_leauto_upgrades.sh test_letsencrypt_auto_certonly_standalone.sh test_sdists.sh; do
# Sleep after each test to give AWS time to terminate instances.
sleep 30s
python multitester.py targets.yaml ./travis-test-farm.pem none "scripts/$script"
done

32
tox.ini
View file

@ -288,7 +288,37 @@ whitelist_externals = openssl
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
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}
[testenv:travis-test-leauto-upgrades]
changedir = {[testenv:travis-test-farm-tests-base]changedir}
commands =
{[testenv:travis-test-farm-tests-base]commands}
python multitester.py targets.yaml travis-test-farm.pem none scripts/test_leauto_upgrades.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}
[testenv:travis-test-letsencrypt-auto-certonly-standalone]
changedir = {[testenv:travis-test-farm-tests-base]changedir}
commands =
{[testenv:travis-test-farm-tests-base]commands}
python multitester.py targets.yaml travis-test-farm.pem none scripts/test_letsencrypt_auto_certonly_standalone.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}
[testenv:travis-test-sdists]
changedir = {[testenv:travis-test-farm-tests-base]changedir}
commands =
{[testenv:travis-test-farm-tests-base]commands}
python multitester.py targets.yaml travis-test-farm.pem none scripts/test_sdists.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}