Use subset of Windows tests for "all" tests. (#26830)

This commit is contained in:
Matt Clay 2017-07-14 16:51:32 -07:00 committed by GitHub
commit 7931e11437
6 changed files with 81 additions and 57 deletions

View file

@ -2,11 +2,6 @@
set -o pipefail
declare -a args
IFS='/:' read -ra args <<< "${TEST}"
job="${args[1]}"
# python versions to test in order
# python 2.7 runs full tests while other versions run minimal tests
python_versions=(
@ -23,15 +18,8 @@ if [ -s /tmp/windows.txt ]; then
echo "Detected changes requiring integration tests specific to Windows:"
cat /tmp/windows.txt
if [ "${job}" != "1" ]; then
echo "Nothing to do, all Windows tests will run under TEST=windows/1 instead."
exit 0
fi
echo "Running Windows integration tests for multiple versions concurrently."
target="windows/ci/"
platforms=(
--windows 2008-SP2
--windows 2008-R2_SP1
@ -42,8 +30,6 @@ else
echo "No changes requiring integration tests specific to Windows were detected."
echo "Running Windows integration tests for a single version only."
target="windows/ci/group${job}/"
platforms=(
--windows 2012-R2_RTM
)
@ -55,17 +41,25 @@ for version in "${python_versions[@]}"; do
# clean up between test runs until we switch from --tox to --docker
rm -rf ~/.ansible/{cp,pc,tmp}/
if [ "${job}" == "1" ] || [ "${version}" == "2.7" ]; then
if [ "${version}" == "2.7" ]; then
# full tests for python 2.7
ci="${target}"
else
# minimal tests for other python versions
ci="windows/ci/minimal/"
fi
changed_all_target="all"
# shellcheck disable=SC2086
ansible-test windows-integration --color -v --retry-on-error "${ci}" --tox --python "${version}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
"${platforms[@]}"
if [ "${version}" == "2.7" ]; then
# smoketest tests for python 2.7
if [ "${CHANGED}" ]; then
# with change detection enabled run tests for anything changed
# use the smoketest tests for any change that triggers all tests
ci="windows/ci/"
changed_all_target="windows/ci/smoketest/"
else
# without change detection enabled run only smoketest tests
ci="windows/ci/smoketest/"
fi
else
# minimal tests for other python versions
ci="windows/ci/minimal/"
fi
# shellcheck disable=SC2086
ansible-test windows-integration --color -v --retry-on-error "${ci}" --tox --python "${version}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
"${platforms[@]}" --changed-all-target "${changed_all_target}"
done