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
Ignore pylint errors caused by compatibility checks for six
2026-05-12 04:22:00 +00:00 · 2025-12-09 08:08:02 +00:00 · 2025-12-09 07:32:44 +00:00 · 2025-12-09 07:09:11 +00:00 · 2025-08-08 00:41:00 +00:00 · 2025-08-08 08:56:42 +09:00
9 changed files with 97 additions and 72 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
@@ -37,13 +37,13 @@ variables:
 resources:
  containers:
    - container: default
-      image: quay.io/ansible/azure-pipelines-test-container:6.0.0
+      image: quay.io/ansible/azure-pipelines-test-container:7.0.0

 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,19 +130,8 @@ stages:
              test: sanity
            - name: Units
              test: units
-  - stage: Sanity_2_15
-    displayName: Ansible 2.15 sanity & Units & Lint
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: "{0}"
-          testFormat: 2.15/{0}
-          targets:
-            - name: Sanity
-              test: sanity
-            - name: Units
-              test: units
+            - name: Lint
+              test: lint
  ## Docker
  - stage: Docker_devel
    displayName: Docker devel
@@ -143,16 +147,30 @@ 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: []
    jobs:
      - template: templates/matrix.yml
        parameters:
-          testFormat: devel/linux/{0}/1
+          testFormat: 2.19/linux/{0}/1
          targets:
-            - name: Fedora 42
-              test: fedora42
+            - name: Fedora 41
+              test: fedora41
            - name: Ubuntu 22.04
              test: ubuntu2204
            - name: Ubuntu 24.04
@@ -198,23 +216,6 @@ stages:
            - name: Ubuntu 22.04
              test: ubuntu2204

-  - stage: Docker_2_15
-    displayName: Docker 2.15
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.15/linux/{0}/1
-          targets:
-            - name: CentOS 7
-              test: centos7
-            - name: Fedora 37
-              test: fedora37
-            - name: openSUSE 15 py3
-              test: opensuse15
-            - name: Ubuntu 22.04
-              test: ubuntu2204
-
  ## Remote
  - stage: Remote_devel
    displayName: Remote devel
@@ -232,13 +233,13 @@ stages:
              test: freebsd/14.3
            - name: FreeBSD 13.5
              test: freebsd/13.5
-  - stage: Remote_2_19
-    displayName: Remote 2.19
+  - stage: Remote_2_20
+    displayName: Remote 2.20
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
        parameters:
-          testFormat: devel/{0}/1
+          testFormat: 2.20/{0}/1
          targets:
            - name: RHEL 10.0
              test: rhel/10.0
@@ -248,6 +249,22 @@ stages:
              test: freebsd/14.3
            - name: FreeBSD 13.5
              test: freebsd/13.5
+  - stage: Remote_2_19
+    displayName: Remote 2.19
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.19/{0}/1
+          targets:
+            - name: RHEL 10.0
+              test: rhel/10.0
+            - 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 2.18
    dependsOn: []
@@ -256,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
@@ -268,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
@@ -280,34 +300,15 @@ stages:
        parameters:
          testFormat: 2.16/{0}/1
          targets:
-            - name: RHEL 8.8
-              test: rhel/8.8
-            - name: RHEL 9.2
-              test: rhel/9.2
-
-  - stage: Remote_2_15
-    displayName: Remote 2.15
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.15/{0}/1
-          targets:
-            - name: RHEL 7.9
-              test: rhel/7.9
-            - name: RHEL 8.7
-              test: rhel/8.7
-            - name: RHEL 9.1
-              test: rhel/9.1
+            # 2.16 remote target only has RHEL 9.6 image
+            - name: RHEL 9.6
+              test: rhel/9.6

  ## Finally

  - stage: Summary
    condition: succeededOrFailed()
    dependsOn:
-      - Sanity_2_15
-      - Remote_2_15
-      - Docker_2_15
      - Sanity_2_16
      - Remote_2_16
      - Docker_2_16
@@ -320,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/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ An Ansible Collection of modules and plugins that target POSIX UNIX/Linux and de
 * Python:
  * The Python interpreter version must meet Ansible Core's requirements.
 * Ansible Core:
-  - ansible-core 2.15 or later
+  - ansible-core 2.16 or later

 ## Installation

--- a/changelogs/fragments/673_update_ci_20250805.yml
+++ b/changelogs/fragments/673_update_ci_20250805.yml
@@ -0,0 +1,2 @@
+trivial:
+  - Update AZP CI matrix (https://github.com/ansible-collections/ansible.posix/issues/673).
--- 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/meta/runtime.yml
+++ b/meta/runtime.yml
@@ -1,2 +1,2 @@
 ---
-requires_ansible: ">=2.15.0"
+requires_ansible: ">=2.16.0"
--- 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
Author	SHA1	Message	Date
softwarefactory-project-zuul[bot]	8feac41f50	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	2025-12-09 08:08:02 +00:00
saito-hideki	04274f4ce7	Ignore pylint errors caused by compatibility checks for six * This is a temporary measure until we stop covering Python2 * Skipped sanity[cannot-ignore] to keep backward compatibility with Python2 * Consolidate all ansible-lint option locations into .ansible-lint * Fixed some typos Signed-off-by: saito-hideki <saito@fgrep.org> (cherry picked from commit `9dc73a686a`)	2025-12-09 07:32:44 +00:00
Hideki Saito	1bcf7f3ee4	Update AZP CI matrix and sanity test * Update AZP CI matrix * Add ignore file for Ansible Core 2.21 * Remove ignore lines for ansible-bad-import-from in 2.20 sanity tests Signed-off-by: Hideki Saito <saito@fgrep.org> (cherry picked from commit `7d5aef07e2`)	2025-12-09 07:09:11 +00:00
softwarefactory-project-zuul[bot]	30db9884ce	Merge pull request #674 from saito-hideki/stable-2_pr673 [Backport][stable-2][AZP] #673 SUMMARY This PR is a backport pull request for #673 to stable-2: Addresses #672 Bump test container version 7.0.0 Removes Ansible Core 2.15 tests. Python 3.11 is no longer supported in Container 7.0.0. ISSUE TYPE CI Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION None	2025-08-08 00:41:00 +00:00
softwarefactory-project-zuul[bot]	d16e94f541	Merge pull request #673 from saito-hideki/pr/ci_update_20250805 [AZP] Update CI matrix SUMMARY Update AZP CI matrix: Addresses #672 Bump test container version 7.0.0 Removes Ansible Core 2.15 tests. Python 3.11 is no longer supported in Container 7.0.0. ISSUE TYPE CI Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION None	2025-08-08 08:56:42 +09:00