From d244e47822e7e45f22ff5f509712065b944c02d9 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Mon, 10 May 2021 18:25:53 -0700 Subject: [PATCH] Update Python versions for controller-only tests. (#74652) * Update Python versions for controller-only tests. Both `ansible-galaxy` and `ansible-test` integration tests only run on the controller. * Use a venv to make requirements available. --- .azure-pipelines/azure-pipelines.yml | 8 +++++--- .../ansible-test-docker/collection-tests/docker.sh | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index a08046321a1..aa83203d585 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -147,8 +147,9 @@ stages: nameFormat: Python {0} testFormat: galaxy/{0}/1 targets: - - test: 2.7 - - test: 3.6 + - test: 3.8 + - test: 3.9 + - test: '3.10' - stage: Generic dependsOn: [] jobs: @@ -157,8 +158,9 @@ stages: nameFormat: Python {0} testFormat: generic/{0}/1 targets: - - test: 2.7 + - test: 3.8 - test: 3.9 + - test: '3.10' - stage: Incidental_Remote displayName: Incidental Remote dependsOn: [] diff --git a/test/integration/targets/ansible-test-docker/collection-tests/docker.sh b/test/integration/targets/ansible-test-docker/collection-tests/docker.sh index e0e342909e5..69372245049 100755 --- a/test/integration/targets/ansible-test-docker/collection-tests/docker.sh +++ b/test/integration/targets/ansible-test-docker/collection-tests/docker.sh @@ -7,7 +7,7 @@ cd "${WORK_DIR}/ansible_collections/ns/col" # common args for all tests # because we are running in shippable/generic/ we are already in the default docker container -common=(--python "${ANSIBLE_TEST_PYTHON_VERSION}" --color --truncate 0 "${@}") +common=(--python "${ANSIBLE_TEST_PYTHON_VERSION}" --venv --venv-system-site-packages --color --truncate 0 "${@}") # prime the venv to work around issue with PyYAML detection in ansible-test ansible-test sanity "${common[@]}" --test ignores