Make test-farm generic

This commit is contained in:
Adrien Ferrand 2020-06-30 12:41:08 +02:00
parent 70ffd68f63
commit 9a07ee541b
2 changed files with 9 additions and 9 deletions

View file

@ -39,7 +39,7 @@ steps:
secureFile: azure-test-farm.pem
condition: contains(variables['TOXENV'], 'test-farm')
- bash: |
ln -s $(testFarmPem.secureFilePath) tests/letstest/azure-test-farm.pem
export AWS_C2_PEM_FILE="$(testFarmPem.secureFilePath)"
condition: contains(variables['TOXENV'], 'test-farm')
- bash: |
if [[ "${TOXENV}" == *"oldest"* ]]; then

16
tox.ini
View file

@ -296,30 +296,30 @@ passenv =
AWS_*
setenv = AWS_DEFAULT_REGION=us-east-1
[testenv:azure-test-farm-apache2]
[testenv:test-farm-apache2]
changedir = {[testenv:azure-test-farm-tests-base]changedir}
commands = python multitester.py apache2_targets.yaml azure-test-farm.pem SET_BY_ENV scripts/test_apache2.sh --repo {toxinidir}
commands = python multitester.py apache2_targets.yaml {env:AWS_C2_PEM_FILE:test-farm.pem} SET_BY_ENV scripts/test_apache2.sh --repo {toxinidir}
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]
[testenv:test-farm-leauto-upgrades]
changedir = {[testenv:azure-test-farm-tests-base]changedir}
commands = python multitester.py targets.yaml azure-test-farm.pem SET_BY_ENV scripts/test_leauto_upgrades.sh --repo {toxinidir}
commands = python multitester.py targets.yaml {env:AWS_C2_PEM_FILE:test-farm.pem} SET_BY_ENV scripts/test_leauto_upgrades.sh --repo {toxinidir}
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]
[testenv:test-farm-certonly-standalone]
changedir = {[testenv:azure-test-farm-tests-base]changedir}
commands = python multitester.py targets.yaml azure-test-farm.pem SET_BY_ENV scripts/test_letsencrypt_auto_certonly_standalone.sh --repo {toxinidir}
commands = python multitester.py targets.yaml {env:AWS_C2_PEM_FILE:test-farm.pem} SET_BY_ENV scripts/test_letsencrypt_auto_certonly_standalone.sh --repo {toxinidir}
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]
[testenv:test-farm-sdists]
changedir = {[testenv:azure-test-farm-tests-base]changedir}
commands = python multitester.py targets.yaml azure-test-farm.pem SET_BY_ENV scripts/test_sdists.sh --repo {toxinidir}
commands = python multitester.py targets.yaml {env:AWS_C2_PEM_FILE:test-farm.pem} SET_BY_ENV scripts/test_sdists.sh --repo {toxinidir}
deps = {[testenv:azure-test-farm-tests-base]deps}
passenv = {[testenv:azure-test-farm-tests-base]passenv}
setenv = {[testenv:azure-test-farm-tests-base]setenv}