From 6c8d6a3182a03a124786d52ead9a52b79b221962 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Wed, 14 Oct 2020 11:19:13 -0700 Subject: [PATCH] [stable-2.10] Fix ansible-test Azure Pipelines container auth. (cherry picked from commit 2ef4b7e07e6a47785544d0b195fe6887b5c4595b) Co-authored-by: Matt Clay --- changelogs/fragments/ansible-test-azp-agent-temp-dir.yml | 2 ++ test/lib/ansible_test/_internal/ci/azp.py | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/ansible-test-azp-agent-temp-dir.yml diff --git a/changelogs/fragments/ansible-test-azp-agent-temp-dir.yml b/changelogs/fragments/ansible-test-azp-agent-temp-dir.yml new file mode 100644 index 00000000000..7ff9f8d82b9 --- /dev/null +++ b/changelogs/fragments/ansible-test-azp-agent-temp-dir.yml @@ -0,0 +1,2 @@ +bugfixes: + - ansible-test - Using the ``--remote`` option on Azure Pipelines now works from a job running in a container. diff --git a/test/lib/ansible_test/_internal/ci/azp.py b/test/lib/ansible_test/_internal/ci/azp.py index 1b7a6398bc0..962e838e7c5 100644 --- a/test/lib/ansible_test/_internal/ci/azp.py +++ b/test/lib/ansible_test/_internal/ci/azp.py @@ -151,8 +151,14 @@ class AzurePipelinesAuthHelper(CryptographyAuthHelper): """ def publish_public_key(self, public_key_pem): # type: (str) -> None """Publish the given public key.""" + try: + agent_temp_directory = os.environ['AGENT_TEMPDIRECTORY'] + except KeyError as ex: + raise MissingEnvironmentVariable(name=ex.args[0]) + # the temporary file cannot be deleted because we do not know when the agent has processed it - with tempfile.NamedTemporaryFile(prefix='public-key-', suffix='.pem', delete=False) as public_key_file: + # placing the file in the agent's temp directory allows it to be picked up when the job is running in a container + with tempfile.NamedTemporaryFile(prefix='public-key-', suffix='.pem', delete=False, dir=agent_temp_directory) as public_key_file: public_key_file.write(to_bytes(public_key_pem)) public_key_file.flush()