From abd057f44774c3ec9dea5c6ccdd42996d397e22f Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Thu, 18 Nov 2021 21:14:54 +0100 Subject: [PATCH] Fix collection dependency installation in CI. (#239) --- tests/utils/shippable/shippable.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index 83388833..6e5588ab 100755 --- a/tests/utils/shippable/shippable.sh +++ b/tests/utils/shippable/shippable.sh @@ -78,7 +78,7 @@ if [ "${test}" == "sanity/extra" ]; then fi # START: HACK -if [ "${script}" != "sanity" ] || [ "${test}" == "sanity/extra" ]; then +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" @@ -86,7 +86,7 @@ if [ "${script}" != "sanity" ] || [ "${test}" == "sanity/extra" ]; then # retry ansible-galaxy -vvv collection install community.internal_test_tools fi -if [ "${script}" != "sanity" ] && [ "${script}" != "units" ]; then +if [ "${script}" != "sanity" ] && [ "${script}" != "units" ] && [ "${test}" != "sanity/extra" ]; then # To prevent Python dependencies on other collections only install other collections for integration tests retry git clone --depth=1 --single-branch https://github.com/ansible-collections/ansible.posix.git "${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/ansible/posix" retry git clone --depth=1 --single-branch https://github.com/ansible-collections/community.crypto.git "${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/community/crypto"