diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index 3caf791a..33f4be58 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -66,6 +66,8 @@ jobs: testing-type: units pre-test-cmd: >- git clone --depth=1 --single-branch --branch stable-1 https://github.com/ansible-collections/community.library_inventory_filtering.git ../../community/library_inventory_filtering_v1 + ; + git clone --depth=1 --single-branch --branch main https://github.com/ansible-collections/community.internal_test_tools.git ../../community/internal_test_tools integration: runs-on: ubuntu-latest diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index c824e2ab..056d5d72 100755 --- a/tests/utils/shippable/shippable.sh +++ b/tests/utils/shippable/shippable.sh @@ -77,7 +77,7 @@ retry git clone --depth=1 --single-branch --branch stable-1 https://github.com/a # 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.library_inventory_filtering_v1 -if [ "${test}" == "sanity/extra" ]; then +if [ "${test}" == "sanity/extra" ] || [ "${test}" == "units/1" ]; 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" @@ -85,7 +85,7 @@ if [ "${test}" == "sanity/extra" ]; then # retry ansible-galaxy -vvv collection install community.internal_test_tools fi -if [ "${script}" != "sanity" ] && [ "${script}" != "units" ] && [ "${test}" != "sanity/extra" ]; then +if [ "${script}" != "sanity/1" ] && [ "${script}" != "units/1" ] && [ "${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"