From 22bc8da78358a58686bd657a85a034a8d4c15190 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Mon, 14 Jun 2021 07:24:01 +0200 Subject: [PATCH] Make extra sanity test runner produce ansibullbot and JUnit output. (#154) --- tests/utils/shippable/sanity.sh | 2 +- tests/utils/shippable/shippable.sh | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/utils/shippable/sanity.sh b/tests/utils/shippable/sanity.sh index dee0626c..360b1c12 100755 --- a/tests/utils/shippable/sanity.sh +++ b/tests/utils/shippable/sanity.sh @@ -14,7 +14,7 @@ else fi if [ "${group}" == "extra" ]; then - ../internal_test_tools/tools/run.py --color + ../internal_test_tools/tools/run.py --color --bot --junit exit fi diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index b4eb037d..35975161 100755 --- a/tests/utils/shippable/shippable.sh +++ b/tests/utils/shippable/shippable.sh @@ -73,6 +73,11 @@ else export ANSIBLE_COLLECTIONS_PATHS="${PWD}/../../../" fi +if [ "${test}" == "sanity/extra" ]; then + retry pip install junit-xml --disable-pip-version-check +fi + +# START: HACK if [ "${script}" != "sanity" ] || [ "${test}" == "sanity/extra" ]; then # Nothing further should be added to this list. # This is to prevent modules or plugins in this collection having a runtime dependency on other collections. @@ -91,9 +96,9 @@ if [ "${script}" != "sanity" ] && [ "${script}" != "units" ]; then # retry ansible-galaxy -vvv collection install community.crypto # retry ansible-galaxy -vvv collection install community.general fi - # END: HACK + export PYTHONIOENCODING='utf-8' if [ "${JOB_TRIGGERED_BY_NAME:-}" == "nightly-trigger" ]; then