From 174d4005caf76d5ed4591e87f9717e7b42af6fbf Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Wed, 1 Jul 2020 00:25:37 +0200 Subject: [PATCH] Use AWS_EC2_PEM_FILE, without default value --- .azure-pipelines/templates/steps/tox-steps.yml | 2 +- tox.ini | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.azure-pipelines/templates/steps/tox-steps.yml b/.azure-pipelines/templates/steps/tox-steps.yml index e58f5e495..181dfa638 100644 --- a/.azure-pipelines/templates/steps/tox-steps.yml +++ b/.azure-pipelines/templates/steps/tox-steps.yml @@ -49,5 +49,5 @@ steps: env: AWS_ACCESS_KEY_ID: $(AWS_ACCESS_KEY_ID) AWS_SECRET_ACCESS_KEY: $(AWS_SECRET_ACCESS_KEY) - AWS_C2_PEM_FILE: $(testFarmPem.secureFilePath) + AWS_EC2_PEM_FILE: $(testFarmPem.secureFilePath) displayName: Run tox diff --git a/tox.ini b/tox.ini index b995f974e..c5de8b047 100644 --- a/tox.ini +++ b/tox.ini @@ -292,28 +292,28 @@ setenv = AWS_DEFAULT_REGION=us-east-1 [testenv:test-farm-apache2] changedir = {[testenv:test-farm-tests-base]changedir} -commands = python multitester.py apache2_targets.yaml {env:AWS_C2_PEM_FILE:test-farm.pem} SET_BY_ENV scripts/test_apache2.sh --repo {toxinidir} +commands = python multitester.py apache2_targets.yaml {env:AWS_EC2_PEM_FILE} SET_BY_ENV scripts/test_apache2.sh --repo {toxinidir} deps = {[testenv:test-farm-tests-base]deps} passenv = {[testenv:test-farm-tests-base]passenv} setenv = {[testenv:test-farm-tests-base]setenv} [testenv:test-farm-leauto-upgrades] changedir = {[testenv:test-farm-tests-base]changedir} -commands = python multitester.py targets.yaml {env:AWS_C2_PEM_FILE:test-farm.pem} SET_BY_ENV scripts/test_leauto_upgrades.sh --repo {toxinidir} +commands = python multitester.py targets.yaml {env:AWS_EC2_PEM_FILE} SET_BY_ENV scripts/test_leauto_upgrades.sh --repo {toxinidir} deps = {[testenv:test-farm-tests-base]deps} passenv = {[testenv:test-farm-tests-base]passenv} setenv = {[testenv:test-farm-tests-base]setenv} [testenv:test-farm-certonly-standalone] changedir = {[testenv:test-farm-tests-base]changedir} -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} +commands = python multitester.py targets.yaml {env:AWS_EC2_PEM_FILE} SET_BY_ENV scripts/test_letsencrypt_auto_certonly_standalone.sh --repo {toxinidir} deps = {[testenv:test-farm-tests-base]deps} passenv = {[testenv:test-farm-tests-base]passenv} setenv = {[testenv:test-farm-tests-base]setenv} [testenv:test-farm-sdists] changedir = {[testenv:test-farm-tests-base]changedir} -commands = python multitester.py targets.yaml {env:AWS_C2_PEM_FILE:test-farm.pem} SET_BY_ENV scripts/test_sdists.sh --repo {toxinidir} +commands = python multitester.py targets.yaml {env:AWS_EC2_PEM_FILE} SET_BY_ENV scripts/test_sdists.sh --repo {toxinidir} deps = {[testenv:test-farm-tests-base]deps} passenv = {[testenv:test-farm-tests-base]passenv} setenv = {[testenv:test-farm-tests-base]setenv}