From 97f729c3d64032ff63e1c940f5c8d3f961cfab29 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Tue, 26 Oct 2021 13:55:12 -0700 Subject: [PATCH] Fix Windows CI scripts. The scripts now use `--list-targets -v` instead of `--explain` to evaluate changes. This is faster and does not trigger parsing of a non-existent inventory file. --- test/utils/shippable/incidental/windows.sh | 2 +- test/utils/shippable/windows.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/utils/shippable/incidental/windows.sh b/test/utils/shippable/incidental/windows.sh index 54527d52344..ad77ace7261 100755 --- a/test/utils/shippable/incidental/windows.sh +++ b/test/utils/shippable/incidental/windows.sh @@ -19,7 +19,7 @@ python_default="$(PYTHONPATH="${PWD}/test/lib" python -c 'from ansible_test._int single_version=2012-R2 # shellcheck disable=SC2086 -ansible-test windows-integration --explain ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} > /tmp/explain.txt 2>&1 || { cat /tmp/explain.txt && false; } +ansible-test windows-integration --list-targets -v ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} > /tmp/explain.txt 2>&1 || { cat /tmp/explain.txt && false; } { grep ' windows-integration: .* (targeted)$' /tmp/explain.txt || true; } > /tmp/windows.txt if [ -s /tmp/windows.txt ] || [ "${CHANGED:+$CHANGED}" == "" ]; then diff --git a/test/utils/shippable/windows.sh b/test/utils/shippable/windows.sh index cbb9ea93482..714588b88bc 100755 --- a/test/utils/shippable/windows.sh +++ b/test/utils/shippable/windows.sh @@ -24,7 +24,7 @@ python_default="$(PYTHONPATH="${PWD}/test/lib" python -c 'from ansible_test._int single_version=2012-R2 # shellcheck disable=SC2086 -ansible-test windows-integration --explain ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} > /tmp/explain.txt 2>&1 || { cat /tmp/explain.txt && false; } +ansible-test windows-integration --list-targets -v ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} > /tmp/explain.txt 2>&1 || { cat /tmp/explain.txt && false; } { grep ' windows-integration: .* (targeted)$' /tmp/explain.txt || true; } > /tmp/windows.txt if [ -s /tmp/windows.txt ] || [ "${CHANGED:+$CHANGED}" == "" ]; then