diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 7c7ec26..88b1f0a 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -122,14 +122,14 @@ stages: parameters: testFormat: devel/linux/{0}/1 targets: - - name: Fedora 40 - test: fedora40 + - name: Fedora 41 + test: fedora41 - name: Ubuntu 22.04 test: ubuntu2204 - name: Ubuntu 24.04 test: ubuntu2404 - stage: Docker_2_18 - displayName: Docker devel + displayName: Docker 2.18 dependsOn: [] jobs: - template: templates/matrix.yml @@ -201,12 +201,14 @@ stages: parameters: testFormat: devel/{0}/1 targets: - - name: RHEL 9.4 - test: rhel/9.4 - - name: FreeBSD 13.3 - test: freebsd/13.3 + - name: RHEL 9.5 + test: rhel/9.5 + - name: FreeBSD 14.2 + test: freebsd/14.2 + - name: FreeBSD 13.5 + test: freebsd/13.5 - stage: Remote_2_18 - displayName: Remote devel + displayName: Remote 2.18 dependsOn: [] jobs: - template: templates/matrix.yml @@ -279,7 +281,7 @@ stages: - Remote_2_18 - Docker_2_18 - Sanity_devel - # - Remote_devel # Wait for test environment release - # - Docker_devel # Wait for test environment release + - Remote_devel # Wait for test environment release + - Docker_devel # Wait for test environment release jobs: - template: templates/coverage.yml diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh index 6269f57..44beb23 100755 --- a/tests/utils/shippable/shippable.sh +++ b/tests/utils/shippable/shippable.sh @@ -62,15 +62,15 @@ else retry pip install "https://github.com/ansible/ansible/archive/stable-${ansible_version}.tar.gz" --disable-pip-version-check fi -export ANSIBLE_COLLECTIONS_PATHS="${PWD}/../../../" +export ANSIBLE_COLLECTIONS_PATH="${PWD}/../../../" # START: HACK install dependencies if [ "${ansible_version}" == "2.9" ] || [ "${ansible_version}" == "2.10" ]; then # Note: Since community.general 5.x, Ansible Core versions prior to 2.11 are not supported. # So we need to use 4.8.1 for Ansible 2.9 and Ansible Engine 2.10. - retry git clone --depth=1 --single-branch -b 4.8.1 https://github.com/ansible-collections/community.general.git "${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/community/general" + retry git clone --depth=1 --single-branch -b 4.8.1 https://github.com/ansible-collections/community.general.git "${ANSIBLE_COLLECTIONS_PATH}/ansible_collections/community/general" else - retry git clone --depth=1 --single-branch https://github.com/ansible-collections/community.general.git "${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/community/general" + retry git clone --depth=1 --single-branch https://github.com/ansible-collections/community.general.git "${ANSIBLE_COLLECTIONS_PATH}/ansible_collections/community/general" fi # Note: we're installing with git to work around Galaxy being a huge PITA (https://github.com/ansible/galaxy/issues/2429) # END: HACK