From 9a07ee541b9c5bba67b0bdaf9e3a843c207b8911 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Tue, 30 Jun 2020 12:41:08 +0200 Subject: [PATCH] Make test-farm generic --- .azure-pipelines/templates/steps/tox-steps.yml | 2 +- tox.ini | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.azure-pipelines/templates/steps/tox-steps.yml b/.azure-pipelines/templates/steps/tox-steps.yml index 2db18ca01..926d8f289 100644 --- a/.azure-pipelines/templates/steps/tox-steps.yml +++ b/.azure-pipelines/templates/steps/tox-steps.yml @@ -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 diff --git a/tox.ini b/tox.ini index 4ed58fec4..2c92d8cf2 100644 --- a/tox.ini +++ b/tox.ini @@ -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}