diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 455d0659b42..7de15cbc6a1 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -56,113 +56,6 @@ resources: pool: Standard stages: -### Sanity - - stage: Sanity_devel - displayName: Sanity devel - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - nameFormat: Test {0} - testFormat: devel/sanity/{0} - targets: - - test: 1 - - test: 2 - - test: 3 - - test: 4 - - stage: Sanity_2_19 - displayName: Sanity 2.19 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - nameFormat: Test {0} - testFormat: 2.19/sanity/{0} - targets: - - test: 1 - - test: 2 - - test: 3 - - test: 4 - - stage: Sanity_2_18 - displayName: Sanity 2.18 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - nameFormat: Test {0} - testFormat: 2.18/sanity/{0} - targets: - - test: 1 - - test: 2 - - test: 3 - - test: 4 - - stage: Sanity_2_17 - displayName: Sanity 2.17 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - nameFormat: Test {0} - testFormat: 2.17/sanity/{0} - targets: - - test: 1 - - test: 2 - - test: 3 - - test: 4 -### Units - - stage: Units_devel - displayName: Units devel - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - nameFormat: Python {0} - testFormat: devel/units/{0}/1 - targets: - - test: 3.9 - - test: '3.10' - - test: '3.11' - - test: '3.12' - - test: '3.13' - - test: '3.14' - - stage: Units_2_19 - displayName: Units 2.19 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - nameFormat: Python {0} - testFormat: 2.19/units/{0}/1 - targets: - - test: 3.8 - - test: "3.11" - - test: "3.13" - - stage: Units_2_18 - displayName: Units 2.18 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - nameFormat: Python {0} - testFormat: 2.18/units/{0}/1 - targets: - - test: 3.8 - - test: "3.11" - - test: "3.13" - - stage: Units_2_17 - displayName: Units 2.17 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - nameFormat: Python {0} - testFormat: 2.17/units/{0}/1 - targets: - - test: 3.7 - - test: "3.10" - - test: "3.12" - -## Remote - stage: Remote_devel_extra_vms displayName: Remote devel extra VMs dependsOn: [] @@ -203,60 +96,6 @@ stages: - 1 - 2 - 3 - - stage: Remote_2_19 - displayName: Remote 2.19 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.19/{0} - targets: - - name: RHEL 9.5 - test: rhel/9.5 - - name: RHEL 10.0 - test: rhel/10.0 - - name: FreeBSD 14.2 - test: freebsd/14.2 - groups: - - 1 - - 2 - - 3 - - stage: Remote_2_18 - displayName: Remote 2.18 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.18/{0} - targets: - - name: macOS 14.3 - test: macos/14.3 - - name: RHEL 9.4 - test: rhel/9.4 - - name: FreeBSD 14.1 - test: freebsd/14.1 - groups: - - 1 - - 2 - - 3 - - stage: Remote_2_17 - displayName: Remote 2.17 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.17/{0} - targets: - - name: FreeBSD 13.5 - test: freebsd/13.5 - - name: RHEL 9.3 - test: rhel/9.3 - groups: - - 1 - - 2 - - 3 - -### Docker - stage: Docker_devel displayName: Docker devel dependsOn: [] @@ -277,60 +116,6 @@ stages: - 1 - 2 - 3 - - stage: Docker_2_19 - displayName: Docker 2.19 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.19/linux/{0} - targets: - - name: Fedora 41 - test: fedora41 - - name: Alpine 3.21 - test: alpine321 - groups: - - 1 - - 2 - - 3 - - stage: Docker_2_18 - displayName: Docker 2.18 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.18/linux/{0} - targets: - - name: Fedora 40 - test: fedora40 - - name: Alpine 3.20 - test: alpine320 - - name: Ubuntu 24.04 - test: ubuntu2404 - groups: - - 1 - - 2 - - 3 - - stage: Docker_2_17 - displayName: Docker 2.17 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.17/linux/{0} - targets: - - name: Fedora 39 - test: fedora39 - - name: Alpine 3.19 - test: alpine319 - - name: Ubuntu 20.04 - test: ubuntu2004 - groups: - - 1 - - 2 - - 3 - -### Community Docker - stage: Docker_community_devel displayName: Docker (community images) devel dependsOn: [] @@ -350,79 +135,12 @@ stages: - 2 - 3 -### Generic -# Right now all generic tests are disabled. Uncomment when at least one of them is re-enabled. -# - stage: Generic_devel -# displayName: Generic devel -# dependsOn: [] -# jobs: -# - template: templates/matrix.yml -# parameters: -# nameFormat: Python {0} -# testFormat: devel/generic/{0}/1 -# targets: -# - test: '3.9' -# - test: '3.12' -# - test: '3.14' -# - stage: Generic_2_19 -# displayName: Generic 2.19 -# dependsOn: [] -# jobs: -# - template: templates/matrix.yml -# parameters: -# nameFormat: Python {0} -# testFormat: 2.19/generic/{0}/1 -# targets: -# - test: '3.9' -# - test: '3.13' -# - stage: Generic_2_18 -# displayName: Generic 2.18 -# dependsOn: [] -# jobs: -# - template: templates/matrix.yml -# parameters: -# nameFormat: Python {0} -# testFormat: 2.18/generic/{0}/1 -# targets: -# - test: '3.8' -# - test: '3.13' -# - stage: Generic_2_17 -# displayName: Generic 2.17 -# dependsOn: [] -# jobs: -# - template: templates/matrix.yml -# parameters: -# nameFormat: Python {0} -# testFormat: 2.17/generic/{0}/1 -# targets: -# - test: '3.7' -# - test: '3.12' - - stage: Summary condition: succeededOrFailed() dependsOn: - - Sanity_devel - - Sanity_2_19 - - Sanity_2_18 - - Sanity_2_17 - - Units_devel - - Units_2_19 - - Units_2_18 - - Units_2_17 - Remote_devel_extra_vms - Remote_devel - - Remote_2_19 - - Remote_2_18 - - Remote_2_17 - Docker_devel - - Docker_2_19 - - Docker_2_18 - - Docker_2_17 - Docker_community_devel -# Right now all generic tests are disabled. Uncomment when at least one of them is re-enabled. -# - Generic_devel -# - Generic_2_19 -# - Generic_2_18 -# - Generic_2_17 jobs: - template: templates/coverage.yml diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index 134ff6de4b4..deda82febcf 100755 --- a/tests/utils/shippable/shippable.sh +++ b/tests/utils/shippable/shippable.sh @@ -61,7 +61,7 @@ command -v pip pip --version pip list --disable-pip-version-check if [ "${ansible_version}" == "devel" ]; then - retry pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check + retry pip install https://github.com/felixfontein/ansible/archive/show-deprecations.tar.gz --disable-pip-version-check else retry pip install "https://github.com/ansible/ansible/archive/stable-${ansible_version}.tar.gz" --disable-pip-version-check fi @@ -86,7 +86,7 @@ retry git clone --depth=1 --single-branch https://github.com/ansible-collections 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 deprecations https://github.com/felixfontein/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" # NOTE: we're installing with git to work around Galaxy being a huge PITA (https://github.com/ansible/galaxy/issues/2429)