ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Divide Windows integration tests into 2 groups. (#29029)

Browse source 
* 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 2017-09-05 15:32:26 -07:00 committed by GitHub
parent 02a362e7de
commit 8f4c8844c4
27 changed files with 46 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
shippable.yml
View file

@ -22,7 +22,8 @@ matrix:
- env: TEST=rhel/7.4
- env: TEST=windows
- env: TEST=windows/1
- env: TEST=windows/2
- env: TEST=network

2
test/integration/targets/connection_winrm/aliases
View file

@ -1,2 +1,2 @@
windows/ci/group3
windows/ci/group1
windows/ci/smoketest

2
test/integration/targets/win_async_wrapper/aliases
View file

@ -1,3 +1,3 @@
async_status
windows/ci/group3
windows/ci/group1
windows/ci/smoketest

2
test/integration/targets/win_chocolatey/aliases
View file

@ -1 +1 @@
windows/ci/group3
windows/ci/group2

2
test/integration/targets/win_command/aliases
View file

@ -1 +1 @@
windows/ci/group3
windows/ci/group2

2
test/integration/targets/win_dsc/aliases
View file

@ -1 +1 @@
windows/ci/group3
windows/ci/group2

2
test/integration/targets/win_environment/aliases
View file

@ -1 +1 @@
windows/ci/group3
windows/ci/group2

2
test/integration/targets/win_eventlog/aliases
View file

@ -1 +1 @@
windows/ci/group3
windows/ci/group1

2
test/integration/targets/win_eventlog_entry/aliases
View file

@ -1 +1 @@
windows/ci/group3
windows/ci/group2

2
test/integration/targets/win_feature/aliases
View file

@ -1 +1 @@
windows/ci/group3
windows/ci/group2

2
test/integration/targets/win_file/aliases
View file

@ -1,2 +1,2 @@
windows/ci/group2
windows/ci/group1
windows/ci/smoketest

2
test/integration/targets/win_firewall_rule/aliases
View file

@ -1 +1 @@
windows/ci/group3
windows/ci/group2

2
test/integration/targets/win_group/aliases
View file

@ -1,2 +1,2 @@
windows/ci/group2
windows/ci/group1
windows/ci/smoketest

2
test/integration/targets/win_group_membership/aliases
View file

@ -1 +1 @@
windows/ci/group3
windows/ci/group2

1
test/integration/targets/win_module_utils/aliases
View file

@ -1 +1,2 @@
windows/ci/group1
windows/ci/smoketest

2
test/integration/targets/win_path/aliases
View file

@ -1,2 +1,2 @@
windows/ci/group2
windows/ci/group1
windows/ci/smoketest

2
test/integration/targets/win_rabbitmq_plugin/aliases
View file

@ -1 +1 @@
windows/ci/group3
windows/ci/group2

2
test/integration/targets/win_region/aliases
View file

@ -1 +1 @@
windows/ci/group3
windows/ci/group2

2
test/integration/targets/win_say/aliases
View file

@ -1 +1 @@
windows/ci/group3
windows/ci/group2

2
test/integration/targets/win_scheduled_task/aliases
View file

@ -1 +1 @@
windows/ci/group3
windows/ci/group1

2
test/integration/targets/win_service/aliases
View file

@ -1,2 +1,2 @@
windows/ci/group3
windows/ci/group1
windows/ci/smoketest

2
test/integration/targets/win_shell/aliases
View file

@ -1,2 +1,2 @@
windows/ci/group3
windows/ci/group1
windows/ci/smoketest

2
test/integration/targets/win_template/aliases
View file

@ -1,2 +1,2 @@
windows/ci/group2
windows/ci/group1
windows/ci/smoketest

2
test/integration/targets/win_timezone/aliases
View file

@ -1 +1 @@
windows/ci/group3
windows/ci/group1

2
test/integration/targets/win_user/aliases
View file

@ -1 +1 @@
windows/ci/group3
windows/ci/group2

2
test/runner/lib/classification.py
View file

@ -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'])

21
test/utils/shippable/windows.sh
View file

@ -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