Merge pull request #694 from saito-hideki/pr/backport_693

[Backport][stable-2][CI] Update AZP CI matrix and sanity test SUMMARY Backporting #693 Backporting #682 ISSUE TYPE CI tests Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION None
2026-01-10 14:45:28 +01:00 · 2025-12-09 08:08:02 +00:00 · 2025-12-09 08:08:02 +00:00 · 8feac41f50
commit 8feac41f50
parent 30db9884ce 04274f4ce7
6 changed files with 86 additions and 15 deletions
--- a/.ansible-lint
+++ b/.ansible-lint
@ -4,7 +4,8 @@
 # SPDX-FileCopyrightText: 2024, Ansible Project

 skip_list:
-  - meta-runtime[unsupported-version]  # Tis rule doesn't make any sense
+  - meta-runtime[unsupported-version]  # This rule doesn't make any sense
  - fqcn[deep]  # This rule produces false positives for files in tests/unit/plugins/action/fixtures/
+  - sanity[cannot-ignore]  # This rule is skipped to keep backward compatibility with Python 2
 exclude_paths:
  - changelogs/
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@ -43,7 +43,7 @@ pool: Standard

 stages:
  - stage: Sanity_devel
-    displayName: Ansible devel sanity
+    displayName: Ansible devel Sanity & Units & Lint
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
@ -57,8 +57,23 @@ stages:
              test: units
            - name: Lint
              test: lint
+  - stage: Sanity_2_20
+    displayName: Ansible 2.20 Sanity & Units & Lint
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: "{0}"
+          testFormat: 2.20/{0}
+          targets:
+            - name: Sanity
+              test: sanity
+            - name: Units
+              test: units
+            - name: Lint
+              test: lint
  - stage: Sanity_2_19
-    displayName: Ansible 2.19 sanitay & Units & Lint
+    displayName: Ansible 2.19 Sanity & Units & Lint
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
@ -73,7 +88,7 @@ stages:
            - name: Lint
              test: lint
  - stage: Sanity_2_18
-    displayName: Ansible 2.18 sanity & Units & Lint
+    displayName: Ansible 2.18 Sanity & Units & Lint
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
@ -88,7 +103,7 @@ stages:
            - name: Lint
              test: lint
  - stage: Sanity_2_17
-    displayName: Ansible 2.17 sanity & Units & Lint
+    displayName: Ansible 2.17 Sanity & Units & Lint
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
@ -103,7 +118,7 @@ stages:
            - name: Lint
              test: lint
  - stage: Sanity_2_16
-    displayName: Ansible 2.16 sanity & Units & Lint
+    displayName: Ansible 2.16 Sanity & Units & Lint
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
@ -115,6 +130,8 @@ stages:
              test: sanity
            - name: Units
              test: units
+            - name: Lint
+              test: lint
  ## Docker
  - stage: Docker_devel
    displayName: Docker devel
@ -130,6 +147,20 @@ stages:
              test: ubuntu2204
            - name: Ubuntu 24.04
              test: ubuntu2404
+  - stage: Docker_2_20
+    displayName: Docker 2.20
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.20/linux/{0}/1
+          targets:
+            - name: Fedora 42
+              test: fedora42
+            - name: Ubuntu 22.04
+              test: ubuntu2204
+            - name: Ubuntu 24.04
+              test: ubuntu2404
  - stage: Docker_2_19
    displayName: Docker 2.19
    dependsOn: []
@ -202,6 +233,22 @@ stages:
              test: freebsd/14.3
            - name: FreeBSD 13.5
              test: freebsd/13.5
+  - stage: Remote_2_20
+    displayName: Remote 2.20
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.20/{0}/1
+          targets:
+            - name: RHEL 10.0
+              test: rhel/10.0
+            - name: RHEL 9.6
+              test: rhel/9.6
+            - name: FreeBSD 14.3
+              test: freebsd/14.3
+            - name: FreeBSD 13.5
+              test: freebsd/13.5
  - stage: Remote_2_19
    displayName: Remote 2.19
    dependsOn: []
@ -226,6 +273,8 @@ stages:
        parameters:
          testFormat: 2.18/{0}/1
          targets:
+            - name: RHEL 10.0
+              test: rhel/10.0
            - name: RHEL 9.4
              test: rhel/9.4
            - name: FreeBSD 13.5
@ -238,8 +287,9 @@ stages:
        parameters:
          testFormat: 2.17/{0}/1
          targets:
-            - name: RHEL 9.3
-              test: rhel/9.3
+            # 2.17 remote target doesn't have RHEL 9 image
+            - name: RHEL 10.0
+              test: rhel/10.0
            - name: FreeBSD 13.5
              test: freebsd/13.5
  - stage: Remote_2_16
@ -250,10 +300,9 @@ stages:
        parameters:
          testFormat: 2.16/{0}/1
          targets:
-            - name: RHEL 8.8
-              test: rhel/8.8
-            - name: RHEL 9.2
-              test: rhel/9.2
+            # 2.16 remote target only has RHEL 9.6 image
+            - name: RHEL 9.6
+              test: rhel/9.6

  ## Finally

@ -272,6 +321,9 @@ stages:
      - Sanity_2_19
      - Remote_2_19
      - Docker_2_19
+      - Sanity_2_20
+      - Remote_2_20
+      - Docker_2_20
      - Sanity_devel
      - Remote_devel
      - Docker_devel
--- a/changelogs/fragments/682_update_ci_20250929.yml
+++ b/changelogs/fragments/682_update_ci_20250929.yml
@ -0,0 +1,4 @@
+trivial:
+  - Updatng AZP CI matrix to ignore ansible-bad-import-from on six(https://github.com/ansible-collections/ansible.posix/pull/682).
+  - Skipped sanity[cannot-ignore] to keep backward compatibility with Python2.
+  - Consolidate all ansible-lint option locations into .ansible-lint file.
--- a/changelogs/fragments/693_azp_update_20251205.yml
+++ b/changelogs/fragments/693_azp_update_20251205.yml
@ -0,0 +1,5 @@
+---
+trivial:
+  - AZP - Update AZP matrix to follow ansible-test changes.
+  - Add ignore file for Ansible Core 2.21.
+  - Remove ignore lines for ansible-bad-import-from in 2.20 sanity tests.
--- a/tests/sanity/ignore-2.21.txt
+++ b/tests/sanity/ignore-2.21.txt
@ -0,0 +1,10 @@
+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
+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
--- a/tests/utils/shippable/lint.sh
+++ b/tests/utils/shippable/lint.sh
@ -9,6 +9,5 @@ command -v ansible
 pip install --upgrade --user pip
 pip install --upgrade --user ansible-lint

-PATH="${PATH/\~/${HOME}}" ansible-lint \
-                                    --exclude changelogs/ \
-                                    --profile=production
+# To specify additional options, you can specify them into .ansible-lint file.
+PATH="${PATH/\~/${HOME}}" ansible-lint