Update Python versions used to run Windows tests.

This commit is contained in:
Matt Clay 2021-05-10 09:36:24 -07:00
parent 7f7d3067e3
commit d85809d592
2 changed files with 14 additions and 20 deletions

View file

@ -13,14 +13,11 @@ stage="${S:-prod}"
provider="${P:-default}" provider="${P:-default}"
# python versions to test in order # python versions to test in order
# python 2.7 runs full tests while other versions run minimal tests IFS=' ' read -r -a python_versions <<< \
python_versions=( "$(PYTHONPATH="${PWD}/test/lib" python -c 'from ansible_test._internal import util; print(" ".join(util.CONTROLLER_PYTHON_VERSIONS))')"
3.5
3.6 # python version to run full tests on while other versions run minimal tests
3.7 python_default="$(PYTHONPATH="${PWD}/test/lib" python -c 'from ansible_test._internal import util; print(util.CONTROLLER_MIN_PYTHON_VERSION)')"
3.8
2.7
)
# version to test when only testing a single version # version to test when only testing a single version
single_version=2012-R2 single_version=2012-R2
@ -53,8 +50,8 @@ else
fi fi
for version in "${python_versions[@]}"; do for version in "${python_versions[@]}"; do
if [ "${version}" == "2.7" ]; then if [ "${version}" == "${python_default}" ]; then
# full tests for python 2.7 # full tests
ci="${target}" ci="${target}"
else else
# minimal tests for other python versions # minimal tests for other python versions

View file

@ -14,14 +14,11 @@ stage="${S:-prod}"
provider="${P:-default}" provider="${P:-default}"
# python versions to test in order # python versions to test in order
# python 2.7 runs full tests while other versions run minimal tests IFS=' ' read -r -a python_versions <<< \
python_versions=( "$(PYTHONPATH="${PWD}/test/lib" python -c 'from ansible_test._internal import util; print(" ".join(util.CONTROLLER_PYTHON_VERSIONS))')"
3.5
3.6 # python version to run full tests on while other versions run minimal tests
3.7 python_default="$(PYTHONPATH="${PWD}/test/lib" python -c 'from ansible_test._internal import util; print(util.CONTROLLER_MIN_PYTHON_VERSION)')"
3.8
2.7
)
# version to test when only testing a single version # version to test when only testing a single version
single_version=2012-R2 single_version=2012-R2
@ -57,8 +54,8 @@ for version in "${python_versions[@]}"; do
changed_all_target="all" changed_all_target="all"
changed_all_mode="default" changed_all_mode="default"
if [ "${version}" == "2.7" ]; then if [ "${version}" == "${python_default}" ]; then
# smoketest tests for python 2.7 # smoketest tests
if [ "${CHANGED}" ]; then if [ "${CHANGED}" ]; then
# with change detection enabled run tests for anything changed # with change detection enabled run tests for anything changed
# use the smoketest tests for any change that triggers all tests # use the smoketest tests for any change that triggers all tests