From 13bbfacb049f6899817836ee650d40bbcd8de13c Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Wed, 17 Jul 2019 14:46:37 -0700 Subject: [PATCH] Show ansible-test --explain errors in CI. --- test/utils/shippable/network.sh | 4 ++-- test/utils/shippable/windows.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/utils/shippable/network.sh b/test/utils/shippable/network.sh index 51093feba4c..a232ef7f6aa 100755 --- a/test/utils/shippable/network.sh +++ b/test/utils/shippable/network.sh @@ -3,8 +3,8 @@ set -o pipefail -eux # shellcheck disable=SC2086 -ansible-test network-integration --explain ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} 2>&1 \ - | { grep ' network-integration: .* (targeted)$' || true; } > /tmp/network.txt +ansible-test network-integration --explain ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} > /tmp/explain.txt 2>&1 || { cat /tmp/explain.txt && false; } +{ grep ' network-integration: .* (targeted)$' /tmp/explain.txt || true; } > /tmp/network.txt if [ "${COVERAGE}" == "--coverage" ]; then # when on-demand coverage is enabled, force tests to run for all network platforms diff --git a/test/utils/shippable/windows.sh b/test/utils/shippable/windows.sh index e96025a25ae..59593fa7f28 100755 --- a/test/utils/shippable/windows.sh +++ b/test/utils/shippable/windows.sh @@ -28,8 +28,8 @@ python_versions=( single_version=2012-R2 # shellcheck disable=SC2086 -ansible-test windows-integration --explain ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} 2>&1 \ - | { grep ' windows-integration: .* (targeted)$' || true; } > /tmp/windows.txt +ansible-test windows-integration --explain ${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 echo "Detected changes requiring integration tests specific to Windows:"