diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index 73afe08611..aafc3a3239 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -40,8 +40,6 @@ jobs: coverage: ${{ github.event_name == 'schedule' && 'always' || 'never' }} pull-request-change-detection: 'true' testing-type: sanity - pre-test-cmd: >- - git clone --depth=1 --single-branch https://github.com/ansible-collections/community.internal_test_tools.git ../../community/internal_test_tools units: runs-on: ubuntu-latest diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index 134ff6de4b..5adf19d547 100755 --- a/tests/utils/shippable/shippable.sh +++ b/tests/utils/shippable/shippable.sh @@ -78,14 +78,16 @@ if [ "${script}" == "linux" ] && [ "$after_script" == "ubuntu2004" ]; then COMMUNITY_CRYPTO_BRANCH=stable-2 fi -# Nothing further should be added to this list. +# To prevent Python dependencies on other collections only install other collections for unit and integration tests # 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 + +if [ "${script}" != "sanity" ]; then + 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}" != "sanity" ] && [ "${script}" != "units" ]; 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 --branch "${COMMUNITY_CRYPTO_BRANCH}" https://github.com/ansible-collections/community.crypto.git "${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/community/crypto" retry git clone --depth=1 --single-branch https://github.com/ansible-collections/community.docker.git "${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/community/docker"