summaryrefslogtreecommitdiff
path: root/test/utils
diff options
context:
space:
mode:
authorMatt Clay <matt@mystile.com>2017-03-14 16:32:21 -0700
committerGitHub <noreply@github.com>2017-03-14 16:32:21 -0700
commit89559f78deb795361bdfbae761c1b3af828c0b43 (patch)
tree88e6f63aba6c5f0e92affee61e48688c2ccf78f2 /test/utils
parent2e28173d49f161862deb500de2c1811245a9be24 (diff)
downloadansible-89559f78deb795361bdfbae761c1b3af828c0b43.tar.gz
Add `--failure-ok` option to `ansible-test`. (#22623)
Diffstat (limited to 'test/utils')
-rwxr-xr-xtest/utils/shippable/other.sh16
1 files changed, 5 insertions, 11 deletions
diff --git a/test/utils/shippable/other.sh b/test/utils/shippable/other.sh
index 01c51907d3..841b9d159d 100755
--- a/test/utils/shippable/other.sh
+++ b/test/utils/shippable/other.sh
@@ -17,17 +17,11 @@ ln -sf x86_64-linux-gnu-gcc-4.9 /usr/bin/x86_64-linux-gnu-gcc
retry.py pip install tox --disable-pip-version-check
-errors=0
+ansible-test compile --failure-ok --color -v --junit --requirements
+ansible-test sanity --failure-ok --color -v --junit --tox --skip-test ansible-doc --python 2.7
+ansible-test sanity --failure-ok --color -v --junit --tox --test ansible-doc --coverage
-set +e
-
-ansible-test compile --color -v --junit --requirements || ((errors++))
-ansible-test sanity --color -v --junit --tox --skip-test ansible-doc --python 2.7 || ((errors++))
-ansible-test sanity --color -v --junit --tox --test ansible-doc --coverage || ((errors++))
-
-set -e
-
-if [ ${errors} -gt 0 ]; then
- echo "${errors} of the above ansible-test command(s) failed."
+if find test/results/bot/ -mindepth 1 -name '.*' -prune -o -print -quit | grep -q .; then
+ echo "One or more of the above ansible-test commands recorded at least one test failure."
exit 1
fi