diff options
| author | Matt Clay <mclay@redhat.com> | 2021-09-20 18:39:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-20 18:39:07 -0700 |
| commit | 4ea8d9a7824827cf3d4a206599ffd7fe3a09eafd (patch) | |
| tree | 57b4ea491f6f93b6b938037e28dca90098754ca2 /test/utils | |
| parent | 989eeb243fcf9236bd54d4df60c01f6db4e642a7 (diff) | |
| download | ansible-4ea8d9a7824827cf3d4a206599ffd7fe3a09eafd.tar.gz | |
ansible-test - split controller/target testing (#75605)
Diffstat (limited to 'test/utils')
| -rwxr-xr-x | test/utils/shippable/incidental/network.sh | 2 | ||||
| -rwxr-xr-x | test/utils/shippable/incidental/windows.sh | 4 | ||||
| -rwxr-xr-x | test/utils/shippable/sanity.sh | 2 | ||||
| -rwxr-xr-x | test/utils/shippable/windows.sh | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/test/utils/shippable/incidental/network.sh b/test/utils/shippable/incidental/network.sh index 4575476a92..1c489f9e31 100755 --- a/test/utils/shippable/incidental/network.sh +++ b/test/utils/shippable/incidental/network.sh @@ -17,7 +17,7 @@ provider="${P:-default}" # python versions to test in order # all versions run full tests IFS=' ' read -r -a python_versions <<< \ - "$(PYTHONPATH="${PWD}/test/lib" python -c 'from ansible_test._internal import util; print(" ".join(util.CONTROLLER_PYTHON_VERSIONS))')" + "$(PYTHONPATH="${PWD}/test/lib" python -c 'from ansible_test._internal import constants; print(" ".join(constants.CONTROLLER_PYTHON_VERSIONS))')" if [ "${python_version}" ]; then # limit tests to a single python version diff --git a/test/utils/shippable/incidental/windows.sh b/test/utils/shippable/incidental/windows.sh index ed9645e1cf..0ca11bfac6 100755 --- a/test/utils/shippable/incidental/windows.sh +++ b/test/utils/shippable/incidental/windows.sh @@ -14,10 +14,10 @@ provider="${P:-default}" # python versions to test in order IFS=' ' read -r -a python_versions <<< \ - "$(PYTHONPATH="${PWD}/test/lib" python -c 'from ansible_test._internal import util; print(" ".join(util.CONTROLLER_PYTHON_VERSIONS))')" + "$(PYTHONPATH="${PWD}/test/lib" python -c 'from ansible_test._internal import constants; print(" ".join(constants.CONTROLLER_PYTHON_VERSIONS))')" # python version to run full tests on while other versions run minimal tests -python_default="$(PYTHONPATH="${PWD}/test/lib" python -c 'from ansible_test._internal import util; print(util.CONTROLLER_MIN_PYTHON_VERSION)')" +python_default="$(PYTHONPATH="${PWD}/test/lib" python -c 'from ansible_test._internal import constants; print(constants.CONTROLLER_MIN_PYTHON_VERSION)')" # version to test when only testing a single version single_version=2012-R2 diff --git a/test/utils/shippable/sanity.sh b/test/utils/shippable/sanity.sh index d58924b4aa..6dc4d1da9a 100755 --- a/test/utils/shippable/sanity.sh +++ b/test/utils/shippable/sanity.sh @@ -23,5 +23,5 @@ esac # shellcheck disable=SC2086 ansible-test sanity --color -v --junit ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \ - --docker --docker-keep-git --base-branch "${base_branch}" \ + --docker --keep-git --base-branch "${base_branch}" \ "${options[@]}" --allow-disabled diff --git a/test/utils/shippable/windows.sh b/test/utils/shippable/windows.sh index 1e76864959..cbb9ea9348 100755 --- a/test/utils/shippable/windows.sh +++ b/test/utils/shippable/windows.sh @@ -15,10 +15,10 @@ provider="${P:-default}" # python versions to test in order IFS=' ' read -r -a python_versions <<< \ - "$(PYTHONPATH="${PWD}/test/lib" python -c 'from ansible_test._internal import util; print(" ".join(util.CONTROLLER_PYTHON_VERSIONS))')" + "$(PYTHONPATH="${PWD}/test/lib" python -c 'from ansible_test._internal import constants; print(" ".join(constants.CONTROLLER_PYTHON_VERSIONS))')" # python version to run full tests on while other versions run minimal tests -python_default="$(PYTHONPATH="${PWD}/test/lib" python -c 'from ansible_test._internal import util; print(util.CONTROLLER_MIN_PYTHON_VERSION)')" +python_default="$(PYTHONPATH="${PWD}/test/lib" python -c 'from ansible_test._internal import constants; print(constants.CONTROLLER_MIN_PYTHON_VERSION)')" # version to test when only testing a single version single_version=2012-R2 |