diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 2556bea65..d41823081 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -50,63 +50,6 @@ pool: Standard stages: -### Sanity & units - - stage: Ansible_devel - displayName: Sanity & Units devel - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - targets: - - name: Sanity - test: 'devel/sanity/1' - - name: Units - test: 'devel/units/1' - - stage: Ansible_2_19 - displayName: Sanity & Units 2.19 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - targets: - - name: Sanity - test: '2.19/sanity/1' - - name: Units - test: '2.19/units/1' - - stage: Ansible_2_18 - displayName: Sanity & Units 2.18 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - targets: - - name: Sanity - test: '2.18/sanity/1' - - name: Units - test: '2.18/units/1' - - stage: Ansible_2_17 - displayName: Sanity & Units 2.17 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - targets: - - name: Sanity - test: '2.17/sanity/1' - - name: Units - test: '2.17/units/1' - - stage: Ansible_2_16 - displayName: Sanity & Units 2.16 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - targets: - - name: Sanity - test: '2.16/sanity/1' - - name: Units - test: '2.16/units/1' - ### Docker - stage: Docker_devel displayName: Docker devel @@ -127,74 +70,6 @@ stages: groups: - 4 - 5 - - stage: Docker_2_19 - displayName: Docker 2.19 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.19/linux/{0} - targets: - - name: Fedora 42 - test: fedora41 - - name: Alpine 3.21 - test: alpine321 - groups: - - 4 - - 5 - - 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: Ubuntu 22.04 - test: ubuntu2204 - - name: Alpine 3.20 - test: alpine320 - groups: - - 4 - - 5 - - 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: Ubuntu 20.04 - test: ubuntu2004 - - name: Alpine 3.19 - test: alpine319 - groups: - - 4 - - 5 - - stage: Docker_2_16 - displayName: Docker 2.16 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.16/linux/{0} - targets: - - name: Fedora 38 - test: fedora38 - - name: CentOS 7 - test: centos7 - - name: openSUSE 15 - test: opensuse15 - - name: Alpine 3 - test: alpine3 - groups: - - 4 - - 5 ### Community Docker - stage: Docker_community_devel @@ -232,95 +107,14 @@ stages: - 3 - 4 - 5 - - 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 - groups: - - 1 - - 2 - - 3 - - 4 - - 5 - - stage: Remote_2_18 - displayName: Remote 2.18 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.18/{0} - targets: - - name: RHEL 9.4 - test: rhel/9.4 - groups: - - 1 - - 2 - - 3 - - 4 - - 5 - - stage: Remote_2_17 - displayName: Remote 2.17 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.17/{0} - targets: - - name: RHEL 9.3 - test: rhel/9.3 - groups: - - 1 - - 2 - - 3 - - 4 - - 5 - - stage: Remote_2_16 - displayName: Remote 2.16 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.16/{0} - targets: - - name: RHEL 9.2 - test: rhel/9.2 - - name: RHEL 8.8 - test: rhel/8.8 - - name: RHEL 7.9 - test: rhel/7.9 - groups: - - 1 - - 2 - - 3 - - 4 - - 5 ## Finally - stage: Summary condition: succeededOrFailed() dependsOn: - - Ansible_devel - - Ansible_2_19 - - Ansible_2_18 - - Ansible_2_17 - - Ansible_2_16 - Remote_devel - - Remote_2_19 - - Remote_2_18 - - Remote_2_17 - - Remote_2_16 - Docker_devel - - Docker_2_19 - - Docker_2_18 - - Docker_2_17 - - Docker_2_16 - Docker_community_devel jobs: - template: templates/coverage.yml diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index 9375b8999..51daa1969 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 @@ -92,7 +92,7 @@ fi if [ "${script}" != "sanity/1" ] && [ "${script}" != "units/1" ]; 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.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)