Divide Windows integration tests into 2 groups. (#29029)
* Divide Windows integration tests into 2 groups. * Support `none` for `--changed-all-target`. * Run 2 separate Windows groups on Shippable. * Only run smoketest and minimal for the group1 job.
This commit is contained in:
Matt Clay
GitHub
parent
02a362e7de
commit
8f4c8844c4
27 changed files with 46 additions and 27 deletions
|
|
@ -22,7 +22,8 @@ matrix:
|
|||
|
||||
- env: TEST=rhel/7.4
|
||||
|
||||
- env: TEST=windows
|
||||
- env: TEST=windows/1
|
||||
- env: TEST=windows/2
|
||||
|
||||
- env: TEST=network
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
windows/ci/group3
|
||||
windows/ci/group1
|
||||
windows/ci/smoketest
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
async_status
|
||||
windows/ci/group3
|
||||
windows/ci/group1
|
||||
windows/ci/smoketest
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
windows/ci/group3
|
||||
windows/ci/group2
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
windows/ci/group3
|
||||
windows/ci/group2
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
windows/ci/group3
|
||||
windows/ci/group2
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
windows/ci/group3
|
||||
windows/ci/group2
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
windows/ci/group3
|
||||
windows/ci/group1
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
windows/ci/group3
|
||||
windows/ci/group2
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
windows/ci/group3
|
||||
windows/ci/group2
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
windows/ci/group2
|
||||
windows/ci/group1
|
||||
windows/ci/smoketest
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
windows/ci/group3
|
||||
windows/ci/group2
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
windows/ci/group2
|
||||
windows/ci/group1
|
||||
windows/ci/smoketest
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
windows/ci/group3
|
||||
windows/ci/group2
|
||||
|
|
|
|||
|
|
@ -1 +1,2 @@
|
|||
windows/ci/group1
|
||||
windows/ci/smoketest
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
windows/ci/group2
|
||||
windows/ci/group1
|
||||
windows/ci/smoketest
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
windows/ci/group3
|
||||
windows/ci/group2
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
windows/ci/group3
|
||||
windows/ci/group2
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
windows/ci/group3
|
||||
windows/ci/group2
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
windows/ci/group3
|
||||
windows/ci/group1
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
windows/ci/group3
|
||||
windows/ci/group1
|
||||
windows/ci/smoketest
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
windows/ci/group3
|
||||
windows/ci/group1
|
||||
windows/ci/smoketest
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
windows/ci/group2
|
||||
windows/ci/group1
|
||||
windows/ci/smoketest
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
windows/ci/group3
|
||||
windows/ci/group1
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
windows/ci/group3
|
||||
windows/ci/group2
|
||||
|
|
|
|||
|
|
@ -98,6 +98,8 @@ def categorize_changes(args, paths, verbose_command=None):
|
|||
commands[command].add(target)
|
||||
|
||||
for command in commands:
|
||||
commands[command].discard('none')
|
||||
|
||||
if any(t == 'all' for t in commands[command]):
|
||||
commands[command] = set(['all'])
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,11 @@
|
|||
|
||||
set -o pipefail
|
||||
|
||||
declare -a args
|
||||
IFS='/:' read -ra args <<< "${TEST}"
|
||||
|
||||
target="windows/ci/group${args[1]}/"
|
||||
|
||||
# python versions to test in order
|
||||
# python 2.7 runs full tests while other versions run minimal tests
|
||||
python_versions=(
|
||||
|
|
@ -12,7 +17,7 @@ python_versions=(
|
|||
)
|
||||
|
||||
# shellcheck disable=SC2086
|
||||
ansible-test windows-integration --explain ${CHANGED:+"$CHANGED"} 2>&1 | { grep ' windows-integration: .* (targeted)$' || true; } > /tmp/windows.txt
|
||||
ansible-test windows-integration "${target}" --explain ${CHANGED:+"$CHANGED"} 2>&1 | { grep ' windows-integration: .* (targeted)$' || true; } > /tmp/windows.txt
|
||||
|
||||
if [ -s /tmp/windows.txt ]; then
|
||||
echo "Detected changes requiring integration tests specific to Windows:"
|
||||
|
|
@ -48,13 +53,23 @@ for version in "${python_versions[@]}"; do
|
|||
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/"
|
||||
ci="${target}"
|
||||
if [ "${target}" == "windows/ci/group1/" ]; then
|
||||
# only run smoketest tests for group1
|
||||
changed_all_target="windows/ci/smoketest/"
|
||||
else
|
||||
# smoketest tests already covered by group1
|
||||
changed_all_target="none"
|
||||
fi
|
||||
else
|
||||
# only run smoketest tests for group1
|
||||
if [ "${target}" != "windows/ci/group1/" ]; then continue; fi
|
||||
# without change detection enabled run only smoketest tests
|
||||
ci="windows/ci/smoketest/"
|
||||
fi
|
||||
else
|
||||
# only run minimal tests for group1
|
||||
if [ "${target}" != "windows/ci/group1/" ]; then continue; fi
|
||||
# minimal tests for other python versions
|
||||
ci="windows/ci/minimal/"
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in a new issue