From 9d958033a568f383e61e2993562f3d9276a1b273 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Mon, 14 Jun 2021 07:39:52 +0200
Subject: [PATCH] Make extra sanity test runner produce ansibullbot and JUnit
 output. (#250)

---
 tests/utils/shippable/sanity.sh    |  5 +----
 tests/utils/shippable/shippable.sh | 12 ++++++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/tests/utils/shippable/sanity.sh b/tests/utils/shippable/sanity.sh
index c216220e..360b1c12 100755
--- a/tests/utils/shippable/sanity.sh
+++ b/tests/utils/shippable/sanity.sh
@@ -14,10 +14,7 @@ else
 fi
 
 if [ "${group}" == "extra" ]; then
-    # ansible-galaxy -vvv collection install community.internal_test_tools
-    git clone --single-branch --depth 1 https://github.com/ansible-collections/community.internal_test_tools.git ../internal_test_tools
-
-    ../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 465ecc17..bffd4acc 100755
--- a/tests/utils/shippable/shippable.sh
+++ b/tests/utils/shippable/shippable.sh
@@ -84,7 +84,19 @@ else
     export ANSIBLE_COLLECTIONS_PATHS="$PWD/../../../"
 fi
 
+if [ "${test}" == "sanity/extra" ]; then
+    retry pip install junit-xml --disable-pip-version-check
+fi
+
 # START: HACK install integration test dependencies
+if [ "${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.
+    retry git clone --depth=1 --single-branch https://github.com/ansible-collections/community.internal_test_tools.git "${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/community/internal_test_tools"
+    # NOTE: we're installing with git to work around Galaxy being a huge PITA (https://github.com/ansible/galaxy/issues/2429)
+    # retry ansible-galaxy -vvv collection install community.internal_test_tools
+fi
+
 if [ "${script}" != "units" ] && [ "${script}" != "sanity" ] && [ "${ansible_version}" != "2.9" ]; then
     retry git clone --depth=1 --single-branch https://github.com/ansible-collections/community.general.git "${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/community/general"
     # NOTE: we're installing with git to work around Galaxy being a huge PITA (https://github.com/ansible/galaxy/issues/2429)