archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Run each Windows version independently in CI.

Browse Source
pull/35994/head
Matt Clay 7 years ago
parent 26f551d1c3
commit 1d419c737d
40 changed files with 68 additions and 50 deletions
Show Stats Download Patch File Download Diff File

21
shippable.yml
Unescape Escape View File

@ -17,10 +17,23 @@ matrix:
- env: T=units/3.6 - env: T=units/3.6
- env: T=units/3.7 - env: T=units/3.7
- env: T=windows/1 - env: T=windows/2008/1
- env: T=windows/2 - env: T=windows/2008-R2/1
- env: T=windows/3 - env: T=windows/2012/1
- env: T=windows/4 - env: T=windows/2012-R2/1
- env: T=windows/2016/1
- env: T=windows/2008/2
- env: T=windows/2008-R2/2
- env: T=windows/2012/2
- env: T=windows/2012-R2/2
- env: T=windows/2016/2
- env: T=windows/2008/3
- env: T=windows/2008-R2/3
- env: T=windows/2012/3
- env: T=windows/2012-R2/3
- env: T=windows/2016/3
- env: T=network - env: T=network

2
test/integration/targets/wait_for_connection/aliases
Unescape Escape View File

@ -1,2 +1,2 @@
posix/ci/group1 posix/ci/group1
windows/ci/group4 windows/ci/group1

2
test/integration/targets/win_acl_inheritance/aliases
Unescape Escape View File

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

2
test/integration/targets/win_audit_policy_system/aliases
Unescape Escape View File

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

2
test/integration/targets/win_audit_rule/aliases
Unescape Escape View File

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

2
test/integration/targets/win_certificate_store/aliases
Unescape Escape View File

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

2
test/integration/targets/win_command/aliases
Unescape Escape View File

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

2
test/integration/targets/win_copy/aliases
Unescape Escape View File

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

2
test/integration/targets/win_disk_facts/aliases
Unescape Escape View File

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

2
test/integration/targets/win_domain_membership/aliases
Unescape Escape View File

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

2
test/integration/targets/win_dotnet_ngen/aliases
Unescape Escape View File

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

2
test/integration/targets/win_dsc/aliases
Unescape Escape View File

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

2
test/integration/targets/win_environment/aliases
Unescape Escape View File

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

2
test/integration/targets/win_eventlog_entry/aliases
Unescape Escape View File

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

2
test/integration/targets/win_exec_wrapper/aliases
Unescape Escape View File

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

2
test/integration/targets/win_firewall/aliases
Unescape Escape View File

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

2
test/integration/targets/win_group_membership/aliases
Unescape Escape View File

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

2
test/integration/targets/win_iis_webbinding/aliases
Unescape Escape View File

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

2
test/integration/targets/win_mapped_drive/aliases
Unescape Escape View File

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

2
test/integration/targets/win_msi/aliases
Unescape Escape View File

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

2
test/integration/targets/win_package/aliases
Unescape Escape View File

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

2
test/integration/targets/win_pagefile/aliases
Unescape Escape View File

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

2
test/integration/targets/win_psmodule/aliases
Unescape Escape View File

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

2
test/integration/targets/win_reg_stat/aliases
Unescape Escape View File

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

2
test/integration/targets/win_regedit/aliases
Unescape Escape View File

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

2
test/integration/targets/win_region/aliases
Unescape Escape View File

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

2
test/integration/targets/win_route/aliases
Unescape Escape View File

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

2
test/integration/targets/win_say/aliases
Unescape Escape View File

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

2
test/integration/targets/win_scheduled_task_stat/aliases
Unescape Escape View File

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

2
test/integration/targets/win_setup/aliases
Unescape Escape View File

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

2
test/integration/targets/win_share/aliases
Unescape Escape View File

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

2
test/integration/targets/win_slurp/aliases
Unescape Escape View File

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

2
test/integration/targets/win_stat/aliases
Unescape Escape View File

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

2
test/integration/targets/win_tempfile/aliases
Unescape Escape View File

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

2
test/integration/targets/win_timezone/aliases
Unescape Escape View File

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

2
test/integration/targets/win_unzip/aliases
Unescape Escape View File

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

2
test/integration/targets/win_uri/aliases
Unescape Escape View File

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

2
test/integration/targets/win_wakeonlan/aliases
Unescape Escape View File

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

2
test/integration/targets/win_whoami/aliases
Unescape Escape View File

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

21
test/utils/shippable/windows.sh
Unescape Escape View File

@ -5,7 +5,8 @@ set -o pipefail
declare -a args declare -a args
IFS='/:' read -ra args <<< "$1" IFS='/:' read -ra args <<< "$1"
target="windows/ci/group${args[1]}/" version="${args[1]}"
target="windows/ci/group${args[2]}/"
stage="${S:-prod}" stage="${S:-prod}"
provider="${P:-default}" provider="${P:-default}"
@ -19,6 +20,9 @@ python_versions=(
2.7 2.7
) )
# version to test when only testing a single version
single_version=2012-R2
# shellcheck disable=SC2086 # shellcheck disable=SC2086
ansible-test windows-integration "${target}" --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
@ -29,18 +33,19 @@ if [ -s /tmp/windows.txt ] || [ "${CHANGED:+$CHANGED}" == "" ]; then
echo "Running Windows integration tests for multiple versions concurrently." echo "Running Windows integration tests for multiple versions concurrently."
platforms=( platforms=(
--windows 2008 --windows "${version}"
--windows 2008-R2
--windows 2012
--windows 2012-R2
--windows 2016
) )
else else
echo "No changes requiring integration tests specific to Windows were detected." echo "No changes requiring integration tests specific to Windows were detected."
echo "Running Windows integration tests for a single version only." echo "Running Windows integration tests for a single version only: ${single_version}"
if [ "${version}" != "${single_version}" ]; then
echo "Skipping this job since it is for: ${version}"
exit 0
fi
platforms=( platforms=(
--windows 2012-R2 --windows "${version}"
) )
fi fi

Write Preview
Loading…
Cancel
Save