From 4bd26a3cc675d10c61126388ac6669a605e19498 Mon Sep 17 00:00:00 2001 From: Hideki Saito Date: Tue, 10 Nov 2026 15:14:07 +0900 Subject: [PATCH] Updated AZP test: (#817) * Added ansible core 2.22 tests * Updated remote OS targets * Remove ansible core 2.17 from AZP remote test * Fixed the substitution logic for AZP test job parameters Signed-off-by: Hideki Saito --- .azure-pipelines/azure-pipelines.yml | 111 ++++++++++++------ .azure-pipelines/templates/test.yml | 2 +- README.md | 3 +- .../fragments/817_ci_update_20261110.yml | 7 ++ tests/sanity/ignore-2.23.txt | 0 5 files changed, 87 insertions(+), 36 deletions(-) create mode 100644 changelogs/fragments/817_ci_update_20261110.yml create mode 100644 tests/sanity/ignore-2.23.txt diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index acc3ba6..286e805 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -59,6 +59,22 @@ stages: - name: Lint test: lint + - stage: Sanity_2_22 + displayName: Ansible 2.22 Sanity & Units & Lint + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + nameFormat: "{0}" + testFormat: 2.22/{0} + targets: + - name: Sanity + test: sanity + - name: Units + test: units + - name: Lint + test: lint + - stage: Sanity_2_21 displayName: Ansible 2.21 Sanity & Units & Lint dependsOn: [] @@ -159,6 +175,8 @@ stages: test: lint ## Docker + # Valid docker targets are located at the following path: + # https://github.com/ansible/ansible/blob//test/lib/ansible_test/_data/completion/docker.txt - stage: Docker_devel displayName: Docker devel dependsOn: [] @@ -174,6 +192,21 @@ stages: - name: Ubuntu 26.04 test: ubuntu2604 + - stage: Docker_2_22 + displayName: Docker 2.22 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + testFormat: 2.22/linux/{0}/1 + targets: + - name: Fedora 44 + test: fedora44 + - name: Ubuntu 24.04 + test: ubuntu2404 + - name: Ubuntu 26.04 + test: ubuntu2604 + - stage: Docker_2_21 displayName: Docker 2.21 dependsOn: [] @@ -263,6 +296,8 @@ stages: test: ubuntu2204 ## Remote + # Valid remote targets are located at the following path: + # https://github.com/ansible/ansible/blob//test/lib/ansible_test/_data/completion/remote.txt - stage: Remote_devel displayName: Remote devel dependsOn: [] @@ -273,8 +308,23 @@ stages: targets: - name: RHEL 10.2 test: rhel/10.2 - - name: RHEL 9.8 py39 - test: rhel/9.8@3.9 + - name: FreeBSD 14.5 + test: freebsd/14.5 + - name: FreeBSD 15.1 + test: freebsd/15.1 + + - stage: Remote_2_22 + displayName: Remote 2.22 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + testFormat: 2.22/{0}/1 + targets: + - name: RHEL 10.2 + test: rhel/10.2 + - name: RHEL 9.8 + test: rhel/9.8 - name: FreeBSD 14.5 test: freebsd/14.5 - name: FreeBSD 15.1 @@ -288,14 +338,14 @@ stages: parameters: testFormat: 2.21/{0}/1 targets: - - name: RHEL 10.1 - test: rhel/10.1 - - name: RHEL 9.7 - test: rhel/9.7 - - name: FreeBSD 14.4 - test: freebsd/14.4 - - name: FreeBSD 15.0 - test: freebsd/15.0 + - name: RHEL 10.2 + test: rhel/10.2 + - name: RHEL 9.8 + test: rhel/9.8 + - name: FreeBSD 14.5 + test: freebsd/14.5 + - name: FreeBSD 15.1 + test: freebsd/15.1 - stage: Remote_2_20 displayName: Remote 2.20 @@ -305,12 +355,12 @@ stages: parameters: testFormat: 2.20/{0}/1 targets: - - name: RHEL 10.1 - test: rhel/10.1 - - name: RHEL 9.7 - test: rhel/9.7 - - name: FreeBSD 14.3 - test: freebsd/14.3 + - name: RHEL 10.2 + test: rhel/10.2 + - name: RHEL 9.8 + test: rhel/9.8 + - name: FreeBSD 14.5 + test: freebsd/14.5 - stage: Remote_2_19 displayName: Remote 2.19 @@ -335,22 +385,11 @@ stages: parameters: testFormat: 2.18/{0}/1 targets: - - name: RHEL 10.1 - test: rhel/10.1 - - name: RHEL 9.7 - test: rhel/9.7 + - name: RHEL 10.2 + test: rhel/10.2 + - name: RHEL 9.8 + test: rhel/9.8 - - stage: Remote_2_17 - displayName: Remote 2.17 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - container: legacy - testFormat: 2.17/{0}/1 - targets: - - name: RHEL 10.0 - test: rhel/10.0 - stage: Remote_2_16 displayName: Remote 2.16 dependsOn: [] @@ -360,8 +399,10 @@ stages: container: legacy testFormat: 2.16/{0}/1 targets: - - name: RHEL 10.1 - test: rhel/10.1 + - name: RHEL 10.2 + test: rhel/10.2 + - name: RHEL 9.8 + test: rhel/9.8 ## Finally @@ -372,7 +413,6 @@ stages: - Remote_2_16 - Docker_2_16 - Sanity_2_17 - - Remote_2_17 - Docker_2_17 - Sanity_2_18 - Remote_2_18 @@ -386,6 +426,9 @@ stages: - Sanity_2_21 - Remote_2_21 - Docker_2_21 + - Sanity_2_22 + - Remote_2_22 + - Docker_2_22 - Sanity_devel - Remote_devel - Docker_devel diff --git a/.azure-pipelines/templates/test.yml b/.azure-pipelines/templates/test.yml index 2c93c14..7b8ee14 100644 --- a/.azure-pipelines/templates/test.yml +++ b/.azure-pipelines/templates/test.yml @@ -15,7 +15,7 @@ parameters: jobs: - ${{ each job in parameters.jobs }}: - - job: test_${{ replace(replace(replace(job.test, '/', '_'), '.', '_'), '-', '_') }} + - job: test_${{ replace(replace(replace(replace(job.test, '/', '_'), '.', '_'), '-', '_'), '@', '_') }} displayName: ${{ job.name }} container: ${{ parameters.container }} workspace: diff --git a/README.md b/README.md index 6389bde..d6789ba 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,8 @@ ansible-doc -t callback ansible.posix.profile_tasks The following ansible-core versions have been tested with this collection: -- ansible-core 2.22 (devel) +- ansible-core 2.23 (devel) +- ansible-core 2.22 (stable) - ansible-core 2.21 (stable) - ansible-core 2.20 (stable) - ansible-core 2.19 (stable) diff --git a/changelogs/fragments/817_ci_update_20261110.yml b/changelogs/fragments/817_ci_update_20261110.yml new file mode 100644 index 0000000..6d47677 --- /dev/null +++ b/changelogs/fragments/817_ci_update_20261110.yml @@ -0,0 +1,7 @@ +--- +trivial: + - CI - Add ansible core 2.22 for AZP tests. + - CI - Update remote OS for AZP tests. + - CI - Remove 2.17 from AZP remote tests. + - CI - Fix the replacement logic for AZP test job parameter. +... diff --git a/tests/sanity/ignore-2.23.txt b/tests/sanity/ignore-2.23.txt new file mode 100644 index 0000000..e69de29