cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update Python versions for controller-only tests. (#74652)

Browse source 
* 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.
This commit is contained in:
Matt Clay 2021-05-10 18:25:53 -07:00 committed by GitHub
parent 7b0c4845d9
commit d244e47822
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.azure-pipelines/azure-pipelines.yml
View file

@ -147,8 +147,9 @@ stages:
nameFormat: Python {0} nameFormat: Python {0}
testFormat: galaxy/{0}/1 testFormat: galaxy/{0}/1
targets: targets:
- test: 2.7 - test: 3.8
- test: 3.6 - test: 3.9
- test: '3.10'
- stage: Generic - stage: Generic
dependsOn: [] dependsOn: []
jobs: jobs:
@ -157,8 +158,9 @@ stages:
nameFormat: Python {0} nameFormat: Python {0}
testFormat: generic/{0}/1 testFormat: generic/{0}/1
targets: targets:
- test: 2.7 - test: 3.8
- test: 3.9 - test: 3.9
- test: '3.10'
- stage: Incidental_Remote - stage: Incidental_Remote
displayName: Incidental Remote displayName: Incidental Remote
dependsOn: [] dependsOn: []

2
test/integration/targets/ansible-test-docker/collection-tests/docker.sh
View file

@ -7,7 +7,7 @@ cd "${WORK_DIR}/ansible_collections/ns/col"
# common args for all tests # common args for all tests
# because we are running in shippable/generic/ we are already in the default docker container # 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 # prime the venv to work around issue with PyYAML detection in ansible-test
ansible-test sanity "${common[@]}" --test ignores ansible-test sanity "${common[@]}" --test ignores