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-03-27 13:53:32 +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
13 changed files with 120 additions and 87 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,14 +57,29 @@ stages:
              test: units
            - name: Lint
              test: lint
-  - stage: Sanity_2_19
-    displayName: Ansible 2.19 sanitay & Units & Lint
+  - stage: Sanity_2_20
+    displayName: Ansible 2.20 Sanity & Units & Lint
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
        parameters:
          nameFormat: "{0}"
-          testFormat: 2.19/{0OI}
+          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 Sanity & Units & Lint
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          nameFormat: "{0}"
+          testFormat: 2.19/{0}
          targets:
            - name: Sanity
              test: sanity
@@ -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,11 +103,10 @@ 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
-        I
        parameters:
          nameFormat: "{0}"
          testFormat: 2.17/{0}
@@ -104,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
@@ -116,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
@@ -138,8 +141,22 @@ stages:
        parameters:
          testFormat: devel/linux/{0}/1
          targets:
-            - name: Fedora 41
-              test: fedora41
+            - name: Fedora 42
+              test: fedora42
+            - name: Ubuntu 22.04
+              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
@@ -150,7 +167,7 @@ stages:
    jobs:
      - template: templates/matrix.yml
        parameters:
-          testFormat: devel/linux/{0}/1
+          testFormat: 2.19/linux/{0}/1
          targets:
            - name: Fedora 41
              test: fedora41
@@ -199,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
@@ -227,10 +227,26 @@ stages:
          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: 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_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
@@ -239,7 +255,7 @@ stages:
    jobs:
      - template: templates/matrix.yml
        parameters:
-          testFormat: devel/{0}/1
+          testFormat: 2.19/{0}/1
          targets:
            - name: RHEL 10.0
              test: rhel/10.0
@@ -257,10 +273,12 @@ 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.3
-              test: freebsd/13.3
+            - name: FreeBSD 13.5
+              test: freebsd/13.5
  - stage: Remote_2_17
    displayName: Remote 2.17
    dependsOn: []
@@ -269,10 +287,11 @@ stages:
        parameters:
          testFormat: 2.17/{0}/1
          targets:
-            - name: RHEL 9.3
-              test: rhel/9.3
-            - name: FreeBSD 13.3
-              test: freebsd/13.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
    displayName: Remote 2.16
    dependsOn: []
@@ -281,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
@@ -321,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

@@ -46,10 +46,10 @@ To upgrade the collection to the latest available version, run the following com
 ansible-galaxy collection install ansible.posix --upgrade
 ```

-You can also install a specific version of the collection, for example, if you need to downgrade when something is broken in the latest version (please report an issue in this repository). Use the following syntax to install version 1.0.0:
+You can also install a specific version of the collection, for example, if you need to downgrade when something is broken in the latest version (please report an issue in this repository). Use the following syntax to install version 2.0.0:

 ```shell
-ansible-galaxy collection install ansible.posix:==1.0.0
+ansible-galaxy collection install ansible.posix:==2.0.0
 ```

 See [using Ansible collections](https://docs.ansible.com/ansible/devel/user_guide/collections_using.html) for more details.
@@ -78,11 +78,10 @@ ansible-doc -t callback ansible.posix.profile_tasks

 The following ansible-core versions have been tested with this collection:

- ansible-core 2.19 (devel)
- ansible-core 2.18 (stable) *
+- ansible-core 2.20 (devel)
+- ansible-core 2.19 (stable) *
+- ansible-core 2.18 (stable)
 - ansible-core 2.17 (stable)
- ansible-core 2.16 (stable)
- ansible-core 2.15 (stable)

 ## Contributing

--- a/changelogs/fragments/660_ci_azp_syntax.yml
+++ b/changelogs/fragments/660_ci_azp_syntax.yml
@@ -0,0 +1,2 @@
+trivial:
+  - AZP - fixed syntax error in CI test.
--- a/changelogs/fragments/665_update_readme_20250728.yml
+++ b/changelogs/fragments/665_update_readme_20250728.yml
@@ -0,0 +1,3 @@
+---
+trivial:
+  - README - Update README to reflect Ansible Core 2.19 release.
--- a/changelogs/fragments/666_azp_update_20250728.yml
+++ b/changelogs/fragments/666_azp_update_20250728.yml
@@ -0,0 +1,3 @@
+---
+trivial:
+  - AZP - Update AZP matrix to follow ansible-test changes.
--- 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/integration/targets/firewalld/aliases
+++ b/tests/integration/targets/firewalld/aliases
@@ -1,3 +1,5 @@
+needs/privileged
+needs/root
 destructive
 shippable/posix/group1
 skip/aix
--- 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
softwarefactory-project-zuul[bot]	535167e254	Merge pull request #668 from saito-hideki/stable-2_665 [Backport][stable-2] #665 SUMMARY Update the README with the release of Ansible Core 2.19 #665 ISSUE TYPE Docs Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION N/A	2025-07-29 05:39:58 +00:00
softwarefactory-project-zuul[bot]	6336671eba	Merge pull request #665 from saito-hideki/pr/readme_20250728 Update README for release of Ansible Core 2.19 SUMMARY README updated with the release of Ansible Core 2.19 https://docs.ansible.com/ansible/devel/roadmap/ROADMAP_2_19.html ISSUE TYPE Docs Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION N/A	2025-07-29 13:28:02 +09:00
softwarefactory-project-zuul[bot]	f7ed590388	Merge pull request #667 from saito-hideki/stable-2_666 [Backport][stable-2] #666 SUMMARY Update AZP matrix to follow ansible-test changes: #666 ISSUE TYPE CI Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION None	2025-07-29 01:46:42 +00:00
softwarefactory-project-zuul[bot]	07c6e38679	Merge pull request #666 from saito-hideki/pr/azp_update_matrix_20250728 [AZP][CI] Update AZP matrix to follow ansible-test changes SUMMARY Update AZP matrix to follow ansible-test changes ansible/ansible/pull/85558 ansible/ansible/pull/85561 ansible/ansible/pull/85562 ISSUE TYPE CI Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION None	2025-07-29 09:27:05 +09:00
softwarefactory-project-zuul[bot]	f6663b7511	Merge pull request #661 from saito-hideki/stable-2 [stable-2][backport][AZP] Merge pull request #660 SUMMARY [AZP] Fixed syntax error in AZP settings cherry-pick #660 ISSUE TYPE CI Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION None	2025-07-17 05:28:54 +00:00
Hideki Saito	8831aa205c	Merge pull request #660 from saito-hideki/pr_azp_syntax [AZP] Fixed syntax error in AZP settings SUMMARY Fixed syntax error in AZP settings ISSUE TYPE CI Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION None	2025-07-17 14:01:01 +09:00