From 7709fbe1682c3cecd9bde06b560299bff3adec95 Mon Sep 17 00:00:00 2001 From: Hideki Saito Date: Tue, 5 May 2026 07:35:41 +0900 Subject: [PATCH] [CI] Update Azure Pipelines distros and fix shebang - Add devel targets for Docker and Remote stages - Split existing targets into 2.21 stages - Fix shebang in timing.py to pass sanity test - Remove unnecessary shebang ignores from sanity ignore files Signed-off-by: Hideki Saito --- .azure-pipelines/azure-pipelines.yml | 59 ++++++++++++++++++++++++++-- tests/sanity/ignore-2.14.txt | 1 - tests/sanity/ignore-2.15.txt | 1 - tests/sanity/ignore-2.16.txt | 1 - tests/sanity/ignore-2.17.txt | 1 - tests/sanity/ignore-2.18.txt | 1 - tests/sanity/ignore-2.19.txt | 1 - tests/sanity/ignore-2.20.txt | 1 - tests/sanity/ignore-2.21.txt | 1 - tests/sanity/ignore-2.22.txt | 9 +++++ tests/utils/shippable/timing.py | 2 +- 11 files changed, 65 insertions(+), 13 deletions(-) create mode 100644 tests/sanity/ignore-2.22.txt diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index b9e02af..c1a59fe 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -58,6 +58,22 @@ stages: - name: Lint test: lint + - stage: Sanity_2_21 + displayName: Ansible 2.21 Sanity & Units & Lint + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + nameFormat: "{0}" + testFormat: 2.21/{0} + targets: + - name: Sanity + test: sanity + - name: Units + test: units + - name: Lint + test: lint + - stage: Sanity_2_20 displayName: Ansible 2.20 Sanity & Units & Lint dependsOn: [] @@ -131,8 +147,23 @@ stages: parameters: testFormat: devel/linux/{0}/1 targets: - - name: Fedora 43 - test: fedora43 + - name: Fedora 44 + test: fedora44 + - name: Ubuntu 22.04 + test: ubuntu2204 + - name: Ubuntu 24.04 + test: ubuntu2404 + + - stage: Docker_2_21 + displayName: Docker 2.21 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + testFormat: devel/linux/{0}/1 + targets: + - name: Fedora 44 + test: fedora44 - name: Ubuntu 22.04 test: ubuntu2204 - name: Ubuntu 24.04 @@ -209,8 +240,25 @@ stages: test: rhel/10.1 - name: RHEL 9.7 test: rhel/9.7 - - name: FreeBSD 14.3 - test: freebsd/14.3 + - name: FreeBSD 14.4 + test: freebsd/14.4 + - name: FreeBSD 15.0 + test: freebsd/15.0 + + - stage: Remote_2_21 + displayName: Remote 2.21 + dependsOn: [] + jobs: + - template: templates/matrix.yml + parameters: + testFormat: devel/{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 @@ -294,6 +342,9 @@ stages: - Sanity_2_20 - Remote_2_20 - Docker_2_20 + - Sanity_2_21 + - Remote_2_21 + - Docker_2_21 - Sanity_devel - Remote_devel - Docker_devel diff --git a/tests/sanity/ignore-2.14.txt b/tests/sanity/ignore-2.14.txt index caf2217..5e37e5f 100644 --- a/tests/sanity/ignore-2.14.txt +++ b/tests/sanity/ignore-2.14.txt @@ -1,2 +1 @@ tests/utils/shippable/check_matrix.py replace-urlopen -tests/utils/shippable/timing.py shebang diff --git a/tests/sanity/ignore-2.15.txt b/tests/sanity/ignore-2.15.txt index caf2217..5e37e5f 100644 --- a/tests/sanity/ignore-2.15.txt +++ b/tests/sanity/ignore-2.15.txt @@ -1,2 +1 @@ tests/utils/shippable/check_matrix.py replace-urlopen -tests/utils/shippable/timing.py shebang diff --git a/tests/sanity/ignore-2.16.txt b/tests/sanity/ignore-2.16.txt index 3cf68c0..e69de29 100644 --- a/tests/sanity/ignore-2.16.txt +++ b/tests/sanity/ignore-2.16.txt @@ -1 +0,0 @@ -tests/utils/shippable/timing.py shebang diff --git a/tests/sanity/ignore-2.17.txt b/tests/sanity/ignore-2.17.txt index 3cf68c0..e69de29 100644 --- a/tests/sanity/ignore-2.17.txt +++ b/tests/sanity/ignore-2.17.txt @@ -1 +0,0 @@ -tests/utils/shippable/timing.py shebang diff --git a/tests/sanity/ignore-2.18.txt b/tests/sanity/ignore-2.18.txt index 3cf68c0..e69de29 100644 --- a/tests/sanity/ignore-2.18.txt +++ b/tests/sanity/ignore-2.18.txt @@ -1 +0,0 @@ -tests/utils/shippable/timing.py shebang diff --git a/tests/sanity/ignore-2.19.txt b/tests/sanity/ignore-2.19.txt index 3cf68c0..e69de29 100644 --- a/tests/sanity/ignore-2.19.txt +++ b/tests/sanity/ignore-2.19.txt @@ -1 +0,0 @@ -tests/utils/shippable/timing.py shebang diff --git a/tests/sanity/ignore-2.20.txt b/tests/sanity/ignore-2.20.txt index 3cf68c0..e69de29 100644 --- a/tests/sanity/ignore-2.20.txt +++ b/tests/sanity/ignore-2.20.txt @@ -1 +0,0 @@ -tests/utils/shippable/timing.py shebang diff --git a/tests/sanity/ignore-2.21.txt b/tests/sanity/ignore-2.21.txt index 9b5e162..7408625 100644 --- a/tests/sanity/ignore-2.21.txt +++ b/tests/sanity/ignore-2.21.txt @@ -1,4 +1,3 @@ -tests/utils/shippable/timing.py shebang plugins/action/synchronize.py pylint:ansible-bad-import-from plugins/callback/cgroup_perf_recap.py pylint:ansible-bad-import-from plugins/modules/mount.py pylint:ansible-bad-import-from diff --git a/tests/sanity/ignore-2.22.txt b/tests/sanity/ignore-2.22.txt new file mode 100644 index 0000000..7408625 --- /dev/null +++ b/tests/sanity/ignore-2.22.txt @@ -0,0 +1,9 @@ +plugins/action/synchronize.py pylint:ansible-bad-import-from +plugins/callback/cgroup_perf_recap.py pylint:ansible-bad-import-from +plugins/modules/mount.py pylint:ansible-bad-import-from +plugins/modules/sysctl.py pylint:ansible-bad-import-from +plugins/shell/csh.py pylint:ansible-bad-import-from +plugins/shell/fish.py pylint:ansible-bad-import-from +tests/unit/mock/procenv.py pylint:ansible-bad-import-from +tests/unit/mock/yaml_helper.py pylint:ansible-bad-import-from +tests/unit/modules/conftest.py pylint:ansible-bad-import-from diff --git a/tests/utils/shippable/timing.py b/tests/utils/shippable/timing.py index 1bfd310..55728ea 100755 --- a/tests/utils/shippable/timing.py +++ b/tests/utils/shippable/timing.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python from __future__ import (absolute_import, division, print_function) __metaclass__ = type