Merge pull request #690 from barpavel/fix-686-module-utils-deprecation

Fix all deprecated module_utils imports before ansible-core 2.24 removal

SUMMARY
Fixes all deprecated ansible.module_utils imports across the entire collection that will be removed in ansible-core 2.24.
This PR comprehensively addresses deprecation warnings reported in #686 by updating import statements in 20 files to use the new recommended import paths, and removes 8 unused test utility files that contained deprecated imports.
Deprecated imports replaced:



Deprecated import
Replacement




ansible.module_utils._text
ansible.module_utils.common.text.converters


ansible.module_utils.common._collections_compat
collections.abc


ansible.module_utils.six.moves.shlex_quote
shlex.quote


ansible.module_utils.six.moves.reduce
functools.reduce


ansible.module_utils.six.moves.urllib.parse.urlparse
urllib.parse.urlparse


ansible.module_utils.six.string_types
basestring/str (Python 2/3 compatible)


ansible.module_utils.six.text_type
str


ansible.module_utils.six.PY3
Removed (simplified Python 2/3 conditionals)


ansible.module_utils.six.with_metaclass
Native metaclass= syntax


ansible.module_utils.six.iteritems
dict.items()



Files fixed (20 files, 1 commit per file for easier review):

plugins/action/patch.py
plugins/action/synchronize.py
plugins/callback/cgroup_perf_recap.py
plugins/callback/json.py
plugins/callback/jsonl.py
plugins/callback/profile_roles.py
plugins/callback/profile_tasks.py
plugins/modules/acl.py
plugins/modules/authorized_key.py
plugins/modules/firewalld_info.py
plugins/modules/mount.py
plugins/modules/patch.py
plugins/modules/rhel_rpm_ostree.py
plugins/modules/rpm_ostree_upgrade.py
plugins/modules/seboolean.py
plugins/modules/synchronize.py
plugins/modules/sysctl.py
plugins/shell/csh.py
plugins/shell/fish.py
tests/unit/modules/system/test_mount.py

Files deleted (8 unused test utility files):
These files are dead code - none of them are imported or used anywhere in the test suite or the collection. Removing them also addresses Python 2.7 compatibility concerns raised in code review, as several contained deprecated imports that would be incorrect to fix for Python 2.

tests/unit/compat/builtins.py
tests/unit/mock/loader.py
tests/unit/mock/path.py
tests/unit/mock/procenv.py
tests/unit/mock/vault_helper.py
tests/unit/mock/yaml_helper.py
tests/unit/modules/conftest.py
tests/unit/modules/utils.py

Completeness verified with:
git grep -n -P '_compat|utils._text|utils.six' -- '*.py' | grep -v yml

This command returns no results, confirming all deprecated imports have been replaced.
Notes on Python 2.7 compatibility:
For modules that may run on Python 2.7 managed hosts (e.g., authorized_key.py, synchronize.py, sysctl.py), Python 2/3 compatible fallbacks were used instead of direct Python 3 replacements:

authorized_key.py: try/except ImportError for urllib.parse.urlparse (falls back to urlparse on Python 2)
synchronize.py: try/except ImportError for shlex.quote (falls back to pipes.quote on Python 2)
sysctl.py: uses sys.version_info to set string_types to str on Python 3 (basestring on Python 2)

Also removes corresponding pylint:ansible-bad-import-from entries from tests/sanity/ignore-2.21.txt and tests/sanity/ignore-2.22.txt where applicable.
Fixes #686
ISSUE TYPE

Bugfix Pull Request

ADDITIONAL INFORMATION
Approach:
Each file is fixed in a separate commit for easier code review. The changelog fragment is added in a final commit. Corresponding pylint:ansible-bad-import-from ignore entries in tests/sanity/ignore-2.21.txt and tests/sanity/ignore-2.22.txt are removed in the same commit as the file fix (or the file removal commit).
CI results:
All 59 checks passing (Azure Pipelines sanity, units, lint, Docker, Remote across ansible-core 2.17 through devel, and Zuul ansible/check).

Reviewed-by: Felix Fontein <felix@fontein.de>
Reviewed-by: Pavel Bar
Reviewed-by: Abhijeet Kasurde

.ansible-lint

@@ -4,6 +4,7 @@
 # SPDX-FileCopyrightText: 2024, Ansible Project
 
 skip_list:
+  - 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
 

.azure-pipelines/azure-pipelines.yml

@@ -37,9 +37,8 @@ variables:
 resources:
   containers:
     - container: default
-      image: quay.io/ansible/azure-pipelines-test-container:8.0.0
-    - container: legacy
       image: quay.io/ansible/azure-pipelines-test-container:7.0.0
+
 pool: Standard
 
 stages:
@@ -129,7 +128,6 @@ stages:
     jobs:
       - template: templates/matrix.yml
         parameters:
-          container: legacy
           nameFormat: "{0}"
           testFormat: 2.17/{0}
           targets:
@@ -140,24 +138,6 @@ stages:
             - name: Lint
               test: lint
 
-    # 2.16 is LTS
-  - stage: Sanity_2_16
-    displayName: Ansible 2.16 Sanity & Units & Lint
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          container: legacy
-          nameFormat: "{0}"
-          testFormat: 2.16/{0}
-          targets:
-            - name: Sanity
-              test: sanity
-            - name: Units
-              test: units
-            - name: Lint
-              test: lint
-
   ## Docker
   - stage: Docker_devel
     displayName: Docker devel
@@ -169,10 +149,10 @@ stages:
           targets:
             - name: Fedora 44
               test: fedora44
+            - name: Ubuntu 22.04
+              test: ubuntu2204
             - name: Ubuntu 24.04
               test: ubuntu2404
-            - name: Ubuntu 26.04
-              test: ubuntu2604
 
   - stage: Docker_2_21
     displayName: Docker 2.21
@@ -180,10 +160,10 @@ stages:
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.21/linux/{0}/1
+          testFormat: devel/linux/{0}/1
           targets:
-            - name: Fedora 43
+            - name: Fedora 44
-              test: fedora43
+              test: fedora44
             - name: Ubuntu 22.04
               test: ubuntu2204
             - name: Ubuntu 24.04
@@ -240,7 +220,6 @@ stages:
     jobs:
       - template: templates/matrix.yml
         parameters:
-          container: legacy
           testFormat: 2.17/linux/{0}/1
           targets:
             - name: Fedora 39
@@ -248,20 +227,6 @@ stages:
             - name: Ubuntu 22.04
               test: ubuntu2204
 
-  - stage: Docker_2_16
-    displayName: Docker 2.16
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          container: legacy
-          testFormat: 2.16/linux/{0}/1
-          targets:
-            - name: Fedora 38
-              test: fedora38
-            - name: Ubuntu 22.04
-              test: ubuntu2204
-
   ## Remote
   - stage: Remote_devel
     displayName: Remote devel
@@ -271,10 +236,10 @@ stages:
         parameters:
           testFormat: devel/{0}/1
           targets:
-            - name: RHEL 10.2
+            - name: RHEL 10.1
-              test: rhel/10.2
+              test: rhel/10.1
-            - name: RHEL 9.8
+            - name: RHEL 9.7
-              test: rhel/9.8
+              test: rhel/9.7
             - name: FreeBSD 14.4
               test: freebsd/14.4
             - name: FreeBSD 15.0
@@ -286,7 +251,7 @@ stages:
     jobs:
       - template: templates/matrix.yml
         parameters:
-          testFormat: 2.21/{0}/1
+          testFormat: devel/{0}/1
           targets:
             - name: RHEL 10.1
               test: rhel/10.1
@@ -326,8 +291,8 @@ stages:
               test: rhel/10.1
             - name: RHEL 9.7
               test: rhel/9.7
-            - name: FreeBSD 14.3
+            - name: FreeBSD 14.2
-              test: freebsd/14.3
+              test: freebsd/14.2
             - name: FreeBSD 13.5
               test: freebsd/13.5
 
@@ -352,34 +317,19 @@ stages:
     jobs:
       - template: templates/matrix.yml
         parameters:
-          container: legacy
           testFormat: 2.17/{0}/1
           targets:
+            # 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: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          container: legacy
-          testFormat: 2.16/{0}/1
-          targets:
-            - name: RHEL 10.1
-              test: rhel/10.1
-
   ## Finally
 
   - stage: Summary
     condition: succeededOrFailed()
     dependsOn:
-      - Sanity_2_16
-      - Remote_2_16
-      - Docker_2_16
       - Sanity_2_17
       - Remote_2_17
       - Docker_2_17

.azure-pipelines/templates/matrix.yml

@@ -14,12 +14,6 @@ parameters:
     type: object
     default: []
 
-  # An optional container resource name to use for the test jobs.
-  # Defaults to "default" if not specified.
-  - name: container
-    type: string
-    default: default
-
   # An optional format string used to generate the job name.
   # - {0} is the name of an item in the targets list.
   - name: nameFormat
@@ -49,7 +43,6 @@ parameters:
 jobs:
   - template: test.yml
     parameters:
-      container: ${{ parameters.container }}
       jobs:
         - ${{ if eq(length(parameters.groups), 0) }}:
           - ${{ each target in parameters.targets }}:

.azure-pipelines/templates/test.yml

@@ -7,17 +7,11 @@ parameters:
   - name: jobs
     type: object
 
-  # An optional container resource name to use for the test jobs.
-  # Defaults to "default" if not specified.
-  - name: container
-    type: string
-    default: default
-
 jobs:
   - ${{ each job in parameters.jobs }}:
     - job: test_${{ replace(replace(replace(job.test, '/', '_'), '.', '_'), '-', '_') }}
       displayName: ${{ job.name }}
-      container: ${{ parameters.container }}
+      container: default
       workspace:
         clean: all
       steps:

CHANGELOG.rst

@@ -4,108 +4,6 @@ ansible.posix Release Notes
 
 .. contents:: Topics
 
-v2.2.2
-======
-
-Release Summary
----------------
-
-This is the minor release of the ``ansible.posix`` collection.
-This changelog contains all changes to the modules and plugins
-in the stable-2 branch that have been added after the release of
-``ansible.posix`` 2.2.1
-
-Bugfixes
---------
-
-- README - Added ``Red Hat Automation Hub`` as correct contact information for Red Hat Ansible Automation Platform subscribers.
-
-v2.2.1
-======
-
-Release Summary
----------------
-
-This is the minor release of the ``ansible.posix`` collection.
-This changelog contains all changes to the modules and plugins
-in the stable-2 branch that have been added after the release of
-``ansible.posix`` 2.2.0
-
-Security Fixes
---------------
-
-- authorized_key - fix local privilege escalation via symlink-following when running as root (https://github.com/ansible-collections/ansible.posix/issues/759).
-
-Bugfixes
---------
-
-- sysctl - reload sysctl only if the sysctl file is ``/etc/sysctl.conf`` or ``/etc/sysctl.conf.local`` (https://github.com/ansible-collections/ansible.posix/issues/663).
-
-v2.2.0
-======
-
-Release Summary
----------------
-
-This is the minor release of the ``ansible.posix`` collection.
-This changelog contains all changes to the modules and plugins
-in the stable-2 branch that have been added after the release of
-``ansible.posix`` 2.1.0
-
-Minor Changes
--------------
-
-- acl - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-- authorized_key - fix deprecated ``ansible.module_utils._text`` and ``ansible.module_utils.six`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).
-- cgroup_perf_recap callback - fix deprecated ``ansible.module_utils._text`` and ``ansible.module_utils.six`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).
-- csh shell plugin - fix deprecated ``ansible.module_utils.six`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).
-- firewalld_info - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-- firewalld_info - use module.warn instead of passing ``warnings`` to ``exit_json`` (https://github.com/ansible-collections/ansible.posix/issues/710).
-- fish shell plugin - fix deprecated ``ansible.module_utils.six`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).
-- json callback - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-- jsonl callback - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-- mount - fix deprecated ``ansible.module_utils._text`` and ``ansible.module_utils.six`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).
-- patch - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-- profile_roles callback - fix deprecated ``ansible.module_utils.six`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-- profile_tasks - Add option to provide a different date/time format (https://github.com/ansible-collections/ansible.posix/issues/279).
-- profile_tasks callback - fix deprecated ``ansible.module_utils.six`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-- removed ANSIBLE_METADATA from remaining plugins.
-- rhel_rpm_ostree - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-- rpm_ostree_upgrade - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-- seboolean - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-- synchronize - fix deprecated ``ansible.module_utils._text``, ``ansible.module_utils.common._collections_compat``, and ``ansible.module_utils.six`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).
-- sysctl - fix deprecated ``ansible.module_utils._text`` and ``ansible.module_utils.six`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).
-
-Bugfixes
---------
-
-- acl - correctly assert needed changes when pointing to a directory and recursive is set to true.
-- ansible.posix.authorized_key - fixes error on permission denied in authorized_key module (https://github.com/ansible-collections/ansible.posix/issues/462).
-- firewalld_info - stop returning warnings as return values; this has been deprecated by ansible-core (https://github.com/ansible-collections/ansible.posix/pull/670).
-- mount - stop returning warnings as return values; this has been deprecated by ansible-core (https://github.com/ansible-collections/ansible.posix/pull/670).
-- patch - removed use of deprecated ``_AnsibleActionDone`` API (https://github.com/ansible-collections/ansible.posix/pull/687).
-
-v2.1.0
-======
-
-Release Summary
----------------
-
-This is the minor release of the ``ansible.posix`` collection.
-This changelog contains all changes to the modules and plugins
-in the stable-2 branch that have been added after the release of
-``ansible.posix`` 2.0.0
-
-Minor Changes
--------------
-
-- profile_tasks and profile_roles callback plugins - avoid deleted/deprecated callback functions, instead use modern interface that was introduced a longer time ago (https://github.com/ansible-collections/ansible.posix/issues/650).
-
-Bugfixes
---------
-
-- ansible.posix.cgroup_perf_recap - fixes json module load path (https://github.com/ansible-collections/ansible.posix/issues/630).
-
 v2.0.0
 ======
 

README.md

@@ -78,15 +78,10 @@ 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.20 (devel)
-- ansible-core 2.21 (stable)
+- ansible-core 2.19 (stable) *
-- ansible-core 2.20 (stable)
+- ansible-core 2.18 (stable)
-- ansible-core 2.19 (stable)
+- ansible-core 2.17 (stable)
-- ansible-core 2.18 (LTS)
-- ansible-core 2.17 (EoL)
-- ansible-core 2.16 (EoL)
-
-For most up to date support info, see the [ansible-core support matrix](https://docs.ansible.com/projects/ansible/latest/reference_appendices/release_and_maintenance.html#ansible-core-support-matrix)
 
 ## Contributing
 
@@ -99,8 +94,7 @@ We welcome community contributions to this collection. For more details, see [Co
 
 ## Support
 
-* Community users can find help through the [Communication](#Communication) section.
+See [Communication](#Communication) section.
-* Red Hat Ansible Automation Platform subscribers can request support through [Automation Hub](https://console.redhat.com/ansible/automation-hub/collections/published/ansible/posix/) by using the "Create issue" button on the collection page.
 
 ## Release Notes and Roadmap
 

changelogs/changelog.yaml

@@ -490,132 +490,3 @@ releases:
     - 597_remove_fstab_comment_on_updating.yml
     - 598_icmp_block_inversion.yml
     release_date: '2024-12-04'
-  2.1.0:
-    changes:
-      bugfixes:
-      - ansible.posix.cgroup_perf_recap - fixes json module load path (https://github.com/ansible-collections/ansible.posix/issues/630).
-      minor_changes:
-      - profile_tasks and profile_roles callback plugins - avoid deleted/deprecated
-        callback functions, instead use modern interface that was introduced a longer
-        time ago (https://github.com/ansible-collections/ansible.posix/issues/650).
-      release_summary: 'This is the minor release of the ``ansible.posix`` collection.
-
-        This changelog contains all changes to the modules and plugins
-
-        in the stable-2 branch that have been added after the release of
-
-        ``ansible.posix`` 2.0.0'
-    fragments:
-    - 2.1.0.yml
-    - 631_fixes_module_path.yml
-    - 642_ci_add_rhel10.yml
-    - 650-profile_tasks_roles.yml
-    - 654_ci_bump_core_version.yml
-    release_date: '2025-07-16'
-  2.2.0:
-    changes:
-      bugfixes:
-      - acl - correctly assert needed changes when pointing to a directory and recursive
-        is set to true.
-      - ansible.posix.authorized_key - fixes error on permission denied in authorized_key
-        module (https://github.com/ansible-collections/ansible.posix/issues/462).
-      - firewalld_info - stop returning warnings as return values; this has been deprecated
-        by ansible-core (https://github.com/ansible-collections/ansible.posix/pull/670).
-      - mount - stop returning warnings as return values; this has been deprecated
-        by ansible-core (https://github.com/ansible-collections/ansible.posix/pull/670).
-      - patch - removed use of deprecated ``_AnsibleActionDone`` API (https://github.com/ansible-collections/ansible.posix/pull/687).
-      minor_changes:
-      - acl - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-      - authorized_key - fix deprecated ``ansible.module_utils._text`` and ``ansible.module_utils.six``
-        imports (https://github.com/ansible-collections/ansible.posix/issues/686).
-      - cgroup_perf_recap callback - fix deprecated ``ansible.module_utils._text``
-        and ``ansible.module_utils.six`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).
-      - csh shell plugin - fix deprecated ``ansible.module_utils.six`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).
-      - firewalld_info - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-      - firewalld_info - use module.warn instead of passing ``warnings`` to ``exit_json``
-        (https://github.com/ansible-collections/ansible.posix/issues/710).
-      - fish shell plugin - fix deprecated ``ansible.module_utils.six`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).
-      - json callback - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-      - jsonl callback - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-      - mount - fix deprecated ``ansible.module_utils._text`` and ``ansible.module_utils.six``
-        imports (https://github.com/ansible-collections/ansible.posix/issues/686).
-      - patch - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-      - profile_roles callback - fix deprecated ``ansible.module_utils.six`` import
-        (https://github.com/ansible-collections/ansible.posix/issues/686).
-      - profile_tasks - Add option to provide a different date/time format (https://github.com/ansible-collections/ansible.posix/issues/279).
-      - profile_tasks callback - fix deprecated ``ansible.module_utils.six`` import
-        (https://github.com/ansible-collections/ansible.posix/issues/686).
-      - removed ANSIBLE_METADATA from remaining plugins.
-      - rhel_rpm_ostree - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-      - rpm_ostree_upgrade - fix deprecated ``ansible.module_utils._text`` import
-        (https://github.com/ansible-collections/ansible.posix/issues/686).
-      - seboolean - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
-      - synchronize - fix deprecated ``ansible.module_utils._text``, ``ansible.module_utils.common._collections_compat``,
-        and ``ansible.module_utils.six`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).
-      - sysctl - fix deprecated ``ansible.module_utils._text`` and ``ansible.module_utils.six``
-        imports (https://github.com/ansible-collections/ansible.posix/issues/686).
-      release_summary: 'This is the minor release of the ``ansible.posix`` collection.
-
-        This changelog contains all changes to the modules and plugins
-
-        in the stable-2 branch that have been added after the release of
-
-        ``ansible.posix`` 2.1.0'
-    fragments:
-    - 2.2.0.yml
-    - 626_profile_tasks_datetime_format.yml
-    - 638_fix_recursive_acl.yml
-    - 639_fix_authorized_key.yml
-    - 660_ci_azp_syntax.yml
-    - 665_update_readme_20250728.yml
-    - 666_azp_update_20250728.yml
-    - 670-deprecations.yml
-    - 673_update_ci_20250805.yml
-    - 682_update_ci_20250929.yml
-    - 686_fix_deprecated_imports.yml
-    - 693_azp_update_20251205.yml
-    - ansible_metadata_removed.yml
-    - firewalld_info_warnings.yml
-    - patch_removed.yml
-    release_date: '2026-05-18'
-  2.2.1:
-    changes:
-      bugfixes:
-      - sysctl - reload sysctl only if the sysctl file is ``/etc/sysctl.conf`` or
-        ``/etc/sysctl.conf.local`` (https://github.com/ansible-collections/ansible.posix/issues/663).
-      release_summary: 'This is the minor release of the ``ansible.posix`` collection.
-
-        This changelog contains all changes to the modules and plugins
-
-        in the stable-2 branch that have been added after the release of
-
-        ``ansible.posix`` 2.2.0'
-      security_fixes:
-      - authorized_key - fix local privilege escalation via symlink-following when
-        running as root (https://github.com/ansible-collections/ansible.posix/issues/759).
-    fragments:
-    - 2.2.1.yml
-    - 643-sysctl-docs.yml
-    - 751_ci_test_container_update.yml
-    - 755_ci_test_container_update.yml
-    - 759_cve_2026_11837.yml
-    - 763_ci_azp_update_devel.yml
-    - freebsd_sysctl.yml
-    release_date: '2026-07-01'
-  2.2.2:
-    changes:
-      bugfixes:
-      - README - Added ``Red Hat Automation Hub`` as correct contact information for
-        Red Hat Ansible Automation Platform subscribers.
-      release_summary: 'This is the minor release of the ``ansible.posix`` collection.
-
-        This changelog contains all changes to the modules and plugins
-
-        in the stable-2 branch that have been added after the release of
-
-        ``ansible.posix`` 2.2.1'
-    fragments:
-    - 2.2.2.yml
-    - 767_remove_unsupported_version_skip.yml
-    - 768_update_support_section.yml
-    release_date: '2026-07-08'

changelogs/fragments/603_bump_version_3.yml

@@ -0,0 +1,2 @@
+trivial:
+  - Bump version to 3.0.0 for the next release (https://github.com/ansible-collections/ansible.posix/issues/603).

changelogs/fragments/618_ci_remove_ubuntu2004.yml

@@ -0,0 +1,2 @@
+trivial:
+  - Remove ubuntu20.04 from CI tests (https://github.com/ansible-collections/ansible.posix/issues/612).

changelogs/fragments/626_profile_tasks_datetime_format.yml

@@ -0,0 +1,3 @@
+---
+minor_changes:
+  - profile_tasks - Add option to provide a different date/time format (https://github.com/ansible-collections/ansible.posix/issues/279).

changelogs/fragments/631_fixes_module_path.yml

@@ -0,0 +1,6 @@
+---
+bugfixes:
+  - ansible.posix.cgroup_perf_recap - fixes json module load path (https://github.com/ansible-collections/ansible.posix/issues/630).
+trivial:
+  - ansible.posix.seboolean - remove unnecessary condition from seboolean integration tests (https://github.com/ansible-collections/ansible.posix/issues/630).
+  - ansible.posix.selinux - optimize conditions for selinux integration tests (https://github.com/ansible-collections/ansible.posix/issues/630).

changelogs/fragments/639_fix_authorized_key.yml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - ansible.posix.authorized_key - fixes error on permission denied in authorized_key module (https://github.com/ansible-collections/ansible.posix/issues/462).

changelogs/fragments/642_ci_add_rhel10.yml

@@ -0,0 +1,2 @@
+trivial:
+  - Add Red Hat Enterprise Linux 10.0 to the CI matrix (https://github.com/ansible-collections/ansible.posix/issues/642).

changelogs/fragments/650-profile_tasks_roles.yml

@@ -0,0 +1,2 @@
+minor_changes:
+  - "profile_tasks and profile_roles callback plugins - avoid deleted/deprecated callback functions, instead use modern interface that was introduced a longer time ago (https://github.com/ansible-collections/ansible.posix/issues/650)."

changelogs/fragments/654_ci_bump_core_version.yml

@@ -0,0 +1,3 @@
+---
+trivial:
+  - Bump ansible-core version to 2.20 of devel branch and add 2.19 to CI

changelogs/fragments/660_ci_azp_syntax.yml

@@ -0,0 +1,2 @@
+trivial:
+  - AZP - fixed syntax error in CI test.

changelogs/fragments/665_update_readme_20250728.yml

@@ -0,0 +1,3 @@
+---
+trivial:
+  - README - Update README to reflect Ansible Core 2.19 release.

changelogs/fragments/666_azp_update_20250728.yml

@@ -0,0 +1,3 @@
+---
+trivial:
+  - AZP - Update AZP matrix to follow ansible-test changes.

changelogs/fragments/670-deprecations.yml

@@ -0,0 +1,3 @@
+bugfixes:
+  - "firewalld_info - stop returning warnings as return values; this has been deprecated by ansible-core (https://github.com/ansible-collections/ansible.posix/pull/670)."
+  - "mount - stop returning warnings as return values; this has been deprecated by ansible-core (https://github.com/ansible-collections/ansible.posix/pull/670)."

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).

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.

changelogs/fragments/686_fix_deprecated_imports.yml

@@ -0,0 +1,19 @@
+---
+minor_changes:
+  - acl - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
+  - authorized_key - fix deprecated ``ansible.module_utils._text`` and ``ansible.module_utils.six`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).
+  - cgroup_perf_recap callback - fix deprecated ``ansible.module_utils._text`` and ``ansible.module_utils.six`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).
+  - csh shell plugin - fix deprecated ``ansible.module_utils.six`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).
+  - firewalld_info - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
+  - fish shell plugin - fix deprecated ``ansible.module_utils.six`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).
+  - json callback - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
+  - jsonl callback - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
+  - mount - fix deprecated ``ansible.module_utils._text`` and ``ansible.module_utils.six`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).
+  - patch - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
+  - profile_roles callback - fix deprecated ``ansible.module_utils.six`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
+  - profile_tasks callback - fix deprecated ``ansible.module_utils.six`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
+  - rhel_rpm_ostree - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
+  - rpm_ostree_upgrade - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
+  - seboolean - fix deprecated ``ansible.module_utils._text`` import (https://github.com/ansible-collections/ansible.posix/issues/686).
+  - synchronize - fix deprecated ``ansible.module_utils._text``, ``ansible.module_utils.common._collections_compat``, and ``ansible.module_utils.six`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).
+  - sysctl - fix deprecated ``ansible.module_utils._text`` and ``ansible.module_utils.six`` imports (https://github.com/ansible-collections/ansible.posix/issues/686).

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.

galaxy.yml

@@ -1,7 +1,7 @@
 ---
 namespace: ansible
 name: posix
-version: 2.2.2
+version: 3.0.0
 readme: README.md
 authors:
   - Ansible (github.com/ansible)

plugins/action/patch.py

@@ -20,7 +20,7 @@ __metaclass__ = type
 
 import os
 
-from ansible.errors import AnsibleError, AnsibleAction, AnsibleActionFail
+from ansible.errors import AnsibleError, AnsibleAction, _AnsibleActionDone, AnsibleActionFail
 from ansible.module_utils.common.text.converters import to_native
 from ansible.module_utils.parsing.convert_bool import boolean
 from ansible.plugins.action import ActionBase
@@ -46,8 +46,7 @@ class ActionModule(ActionBase):
             elif remote_src:
                 # everything is remote, so we just execute the module
                 # without changing any of the module arguments
-                result.update(self._execute_module(task_vars=task_vars))
+                raise _AnsibleActionDone(result=self._execute_module(task_vars=task_vars))
-                return result
 
             try:
                 src = self._find_needle('files', src)

plugins/callback/cgroup_perf_recap.py

@@ -6,6 +6,9 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
+ANSIBLE_METADATA = {'metadata_version': '1.1',
+                    'status': ['preview'],
+                    'supported_by': 'community'}
 
 DOCUMENTATION = '''
     name: cgroup_perf_recap

plugins/modules/acl.py

@@ -244,16 +244,16 @@ def acl_changed(module, cmd, entry, use_nfsv4_acls=False):
     lines = run_acl(module, cmd)
     counter = 0
     for line in lines:
-        if not use_nfsv4_acls and not line.endswith('*,*'):
+        if line.endswith('*,*') and not use_nfsv4_acls:
-            return True
+            return False
         # if use_nfsv4_acls and entry is listed
         if use_nfsv4_acls and entry == line:
             counter += 1
 
     # The current 'nfs4_setfacl --test' lists a new entry,
-    # which will be added at the top of the list, followed by the existing entries.
+    #  which will be added at the top of list, followed by the existing entries.
-    # So if the entry has already been registered, the entry should be found twice.
+    # So if the entry has already been registered, the entry should be find twice.
-    if not use_nfsv4_acls or counter == 2:
+    if counter == 2:
         return False
     return True
 

plugins/modules/authorized_key.py

@@ -121,10 +121,10 @@ EXAMPLES = r'''
   ansible.posix.authorized_key:
     user: deploy
     state: present
-    key: "{{ lookup('file', item) }}"
+    key: '{{ item }}'
-    loop:
+  with_file:
-      - public_keys/doe-jane
+    - public_keys/doe-jane
-      - public_keys/doe-john
+    - public_keys/doe-john
 
 - name: Set authorized key defining key options
   ansible.posix.authorized_key:
@@ -307,17 +307,6 @@ class keydict(dict):
         return [item[1] for item in self.items()]
 
 
-def _safe_open_write(module, path, follow):
-    flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC
-    if not follow and hasattr(os, 'O_NOFOLLOW'):
-        flags |= os.O_NOFOLLOW
-    try:
-        fd = os.open(path, flags, int('0600', 8))
-    except OSError as e:
-        module.fail_json(msg="File open failed %s : %s" % (path, to_native(e)))
-    return fd
-
-
 def keyfile(module, user, write=False, path=None, manage_dir=True, follow=False):
     """
     Calculate name of authorized keys file, optionally creating the
@@ -370,7 +359,7 @@ def keyfile(module, user, write=False, path=None, manage_dir=True, follow=False)
                 module.fail_json(msg="Failed to create directory %s : %s" % (sshdir, to_native(e)))
             if module.selinux_enabled():
                 module.set_default_selinux_context(sshdir, False)
-        os.chown(sshdir, uid, gid, follow_symlinks=follow)
+        os.chown(sshdir, uid, gid)
         os.chmod(sshdir, int('0700', 8))
 
     if not os.path.exists(keysfile):
@@ -378,13 +367,16 @@ def keyfile(module, user, write=False, path=None, manage_dir=True, follow=False)
         if not os.path.exists(basedir):
             os.makedirs(basedir)
 
-        fd = _safe_open_write(module, keysfile, follow)
+        f = None
-        os.close(fd)
+        try:
+            f = open(keysfile, "w")  # touches file so we can set ownership and perms
+        finally:
+            f.close()
         if module.selinux_enabled():
             module.set_default_selinux_context(keysfile, False)
 
     try:
-        os.chown(keysfile, uid, gid, follow_symlinks=follow)
+        os.chown(keysfile, uid, gid)
         os.chmod(keysfile, int('0600', 8))
     except OSError:
         pass
@@ -615,7 +607,7 @@ def enforce_state(module, params):
 
     # check current state -- just get the filename, don't create file
     do_write = False
-    params["keyfile"] = keyfile(module, user, do_write, path, manage_dir, follow)
+    params["keyfile"] = keyfile(module, user, do_write, path, manage_dir)
     existing_content = readfile(module, params["keyfile"])
     existing_keys = parsekeys(module, existing_content)
 
@@ -704,11 +696,6 @@ def enforce_state(module, params):
 
         if not module.check_mode:
             writefile(module, filename, new_content)
-            user_entry = pwd.getpwnam(user)
-            uid = user_entry.pw_uid
-            gid = user_entry.pw_gid
-            os.chown(filename, uid, gid, follow_symlinks=follow)
-            os.chmod(filename, int('0600', 8))
         params['changed'] = True
 
     return params

plugins/modules/firewalld_info.py

@@ -333,6 +333,10 @@ def main():
     if not HAS_FIREWALLD:
         module.fail_json(msg=missing_required_lib('python-firewall'))
 
+    # If you want to show warning messages in the task running process,
+    # you can append the message to the 'warn' list.
+    warn = list()
+
     try:
         client = fw_client.FirewallClient()
 
@@ -352,7 +356,8 @@ def main():
             collect_zones = list(set(specified_zones) & set(all_zones))
             ignore_zones = list(set(specified_zones) - set(collect_zones))
             if ignore_zones:
-                module.warn('Please note: zone:(%s) have been ignored in the gathering process.' % ", ".join(ignore_zones))
+                warn.append(
+                    'Please note: zone:(%s) have been ignored in the gathering process.' % ','.join(ignore_zones))
         else:
             collect_zones = get_all_zones(client)
 
@@ -391,6 +396,7 @@ def main():
     result['collected_zones'] = collect_zones
     result['undefined_zones'] = ignore_zones
     result['firewalld_info'] = firewalld_info
+    result['warnings'] = warn
     module.exit_json(**result)
 
 

plugins/modules/rhel_rpm_ostree.py

@@ -7,6 +7,9 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
+ANSIBLE_METADATA = {'metadata_version': '1.1',
+                    'status': ['preview'],
+                    'supported_by': 'community'}
 
 DOCUMENTATION = '''
 ---

plugins/modules/rpm_ostree_upgrade.py

@@ -7,6 +7,9 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
+ANSIBLE_METADATA = {'metadata_version': '1.1',
+                    'status': ['preview'],
+                    'supported_by': 'community'}
 
 DOCUMENTATION = '''
 ---

plugins/modules/sysctl.py

@@ -44,7 +44,6 @@ options:
             - If V(true), performs a C(/sbin/sysctl -p) if the O(sysctl_file) is
               updated. If V(false), does not reload C(sysctl) even if the
               O(sysctl_file) is updated.
-            - For FreeBSD, can not be used with O(sysctl_file) other than C(/etc/sysctl.conf) or C(/etc/sysctl.conf.local).
         type: bool
         default: true
     sysctl_file:
@@ -57,17 +56,6 @@ options:
             - Verify token value with the sysctl command and set with C(-w) if necessary.
         type: bool
         default: false
-attributes:
-  check_mode:
-    support: full
-    description: Can run in check_mode and return changed status prediction without modifying target.
-  diff_mode:
-    support: none
-    description: Does not support differences output.
-  platform:
-    platforms: posix
-    support: full
-    description: Supported on POSIX-compliant systems.
 author:
 - David CHANIAL (@davixx)
 '''
@@ -167,11 +155,6 @@ class SysctlModule(object):
 
         self.platform = platform.system().lower()
 
-        # system specific tests
-        freebsd_sysctl_files = ['/etc/sysctl.conf', '/etc/sysctl.conf.local']
-        if self.platform == 'freebsd' and self.sysctl_file not in freebsd_sysctl_files and self.args['reload']:
-            self.module.fail_json(msg="%s can not be reloaded. Set reload=False." % self.sysctl_file)
-
         # Whitespace is bad
         self.args['name'] = self.args['name'].strip()
         self.args['value'] = self._parse_value(self.args['value'])

tests/integration/targets/acl/tasks/acl.yml

@@ -1,6 +1,20 @@
 ---
 # (c) 2017, Martin Krizek <mkrizek@redhat.com>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
 - name: Create ansible user
   ansible.builtin.user:
@@ -29,17 +43,15 @@
 
 - name: Create ansible dir
   ansible.builtin.file:
-    path: "{{ item.path }}"
+    path: "{{ test_dir }}"
     state: directory
-    mode: "{{ item.mode }}"
+    mode: "0755"
-  loop:
-    - { path: "{{ test_dir }}", mode: "0755" }
-    - { path: "{{ test_recursive_dir }}", mode: "0755" }
 
 - name: Install acl package
   ansible.builtin.package:
     name: acl
     state: present
+
 ##############################################################################
 - name: Grant ansible user read access to a file
   ansible.posix.acl:
@@ -237,38 +249,3 @@
       - "'default:mask::rwx' in getfacl_output.stdout_lines"
       - "'default:other::r-x' in getfacl_output.stdout_lines"
       - "'default:group:{{ test_group }}:rw-' not in getfacl_output.stdout_lines"
-
-##############################################################################
-
-- name: create file
-  ansible.builtin.copy:
-    dest: "{{ test_recursive_dir }}/txt.txt"
-    mode: '0440'
-    content: "hw"
-
-- name: Change ACLs recursively
-  ansible.posix.acl:
-    path: "{{ test_recursive_dir }}"
-    entity: "{{ test_user }}"
-    etype: user
-    permissions: rX
-    state: present
-    recursive: true
-  register: output_acl_change
-
-- name: Remove ACLs recursively again
-  ansible.posix.acl:
-    path: "{{ test_recursive_dir }}"
-    entity: "{{ test_user }}"
-    etype: user
-    permissions: r
-    state: present
-    recursive: true
-  register: output_acl_remove
-
-- assert:
-    that:
-      - output_acl_change is changed
-      - output_acl_change is not failed
-      - output_acl_remove is changed
-      - output_acl_remove is not failed

tests/integration/targets/acl/tasks/main.yml

@@ -1,6 +1,20 @@
 ---
 # (c) 2017, Martin Krizek <mkrizek@redhat.com>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
 - name: Test ACL
   vars:
@@ -8,7 +22,6 @@
     test_group: ansible_group
     test_file: "{{ output_dir }}/ansible file"
     test_dir: "{{ output_dir }}/ansible_dir/with some space"
-    test_recursive_dir: "{{ output_dir }}/recursive_dir"
   block:
     - name: Include tests task file
       ansible.builtin.include_tasks: acl.yml

tests/integration/targets/authorized_key/tasks/check_symlink.yml

@@ -1,22 +0,0 @@
----
-#
-# Check: keysfile is symlink and follow=false
-#
-- name: Try to add key with keysfile as symlink
-  ansible.posix.authorized_key:
-    user: testuser
-    key: "{{ rsa_key_basic }}"
-    state: present
-    manage_dir: false
-    follow: false
-
-- name: Assert target file ownership unchanged
-  ansible.builtin.stat:
-    path: /tmp/symlink_test_target/target_file
-  register: target_file_stat
-
-- name: Verify target file is still owned by root
-  ansible.builtin.assert:
-    that:
-      - target_file_stat.stat.uid == 0
-...

tests/integration/targets/authorized_key/tasks/check_symlink_cleanup.yml

@@ -1,12 +0,0 @@
----
-- name: Remove testuser
-  ansible.builtin.user:
-    name: testuser
-    state: absent
-    remove: true
-
-- name: Remove symlink target directory
-  ansible.builtin.file:
-    path: /tmp/symlink_test_target
-    state: absent
-...

tests/integration/targets/authorized_key/tasks/check_symlink_setup.yml

@@ -1,38 +0,0 @@
----
-- name: Create testuser for symlink tests
-  ansible.builtin.user:
-    name: testuser
-    create_home: true
-  register: testuser_result
-
-- name: Create symlink target directory
-  ansible.builtin.file:
-    path: /tmp/symlink_test_target
-    state: directory
-    owner: root
-    mode: '0700'
-
-- name: Create a target file owned by root
-  ansible.builtin.copy:
-    dest: /tmp/symlink_test_target/target_file
-    content: "sensitive data"
-    owner: root
-    mode: '0600'
-
-- name: Remove .ssh directory if exists
-  ansible.builtin.file:
-    path: "{{ testuser_result.home }}/.ssh"
-    state: absent
-
-- name: Create .ssh directory
-  ansible.builtin.file:
-    path: "{{ testuser_result.home }}/.ssh"
-    state: directory
-    mode: '0700'
-
-- name: Create symlink from authorized_keys to target file
-  ansible.builtin.file:
-    src: /tmp/symlink_test_target/target_file
-    dest: "{{ testuser_result.home }}/.ssh/authorized_keys"
-    state: link
-...

tests/integration/targets/authorized_key/tasks/main.yml

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-- name: Setup for testing environment
+- name: Setup testing environment
   ansible.builtin.import_tasks: setup_steps.yml
 
 - name: Test for multiple keys handling
@@ -37,12 +37,3 @@
 
 - name: Test for permission denied files
   ansible.builtin.import_tasks: check_permissions.yml
-
-- name: CVE-2026-11837 Setup for symlink tests
-  ansible.builtin.import_tasks: check_symlink_setup.yml
-
-- name: CVE-2026-11837 Test for symlink tests
-  ansible.builtin.import_tasks: check_symlink.yml
-
-- name: CVE-2026-11837 Cleanup symlink test
-  ansible.builtin.import_tasks: check_symlink_cleanup.yml

tests/integration/targets/firewalld_info/tasks/run_tests_in_started.yml

@@ -20,7 +20,6 @@
 - name: Assert turn active_zones true
   ansible.builtin.assert:
     that:
-      - result.collected_zones == ['public']
 
 - name: Ensure firewalld_zones with zone list
   ansible.posix.firewalld_info:
@@ -32,6 +31,3 @@
 - name: Assert specified zones
   ansible.builtin.assert:
     that:
-      - result.collected_zones == ['public']
-      - result.undefined_zones == ['invalid_zone']
-      - '"invalid_zone" in result.warnings[0]'

tests/sanity/ignore-2.14.txt

@@ -0,0 +1 @@
+tests/utils/shippable/check_matrix.py replace-urlopen

tests/sanity/ignore-2.15.txt

@@ -0,0 +1 @@
+tests/utils/shippable/check_matrix.py replace-urlopen

tests/unit/requirements.txt

@@ -0,0 +1,42 @@
+boto3
+placebo
+pycrypto
+passlib
+pypsrp
+python-memcached
+pytz
+pyvmomi
+redis
+requests
+setuptools > 0.6 # pytest-xdist installed via requirements does not work with very old setuptools (sanity_ok)
+unittest2 ; python_version < '2.7'
+importlib ; python_version < '2.7'
+netaddr
+ipaddress
+netapp-lib
+solidfire-sdk-python
+
+# requirements for F5 specific modules
+f5-sdk ; python_version >= '2.7'
+f5-icontrol-rest ; python_version >= '2.7'
+deepdiff
+
+# requirement for Fortinet specific modules
+pyFMG
+
+# requirement for aci_rest module
+xmljson
+
+# requirement for winrm connection plugin tests
+pexpect
+
+# requirement for the linode module
+linode-python # APIv3
+linode_api4 ; python_version > '2.6' # APIv4
+
+# requirement for the gitlab module
+python-gitlab
+httmock
+
+# requirment for kubevirt modules
+openshift ; python_version >= '2.7'

tests/utils/shippable/shippable.sh

@@ -65,16 +65,13 @@ fi
 export ANSIBLE_COLLECTIONS_PATH="${PWD}/../../../"
 
 # START: HACK install dependencies
-if [ "${ansible_version}" == "2.16" ]; then
+if [ "${ansible_version}" == "2.9" ] || [ "${ansible_version}" == "2.10" ]; then
-# Note: Since community.general 12.x dropped support for ansible-core 2.16,
+    # Note: Since community.general 5.x, Ansible Core versions prior to 2.11 are not supported.
-# we need to use stable-11 for ansible-core 2.16.
+    # So we need to use 4.8.1 for Ansible 2.9 and Ansible Engine 2.10.
-    target_branch='stable-11'
+    retry git clone --depth=1 --single-branch -b 4.8.1 https://github.com/ansible-collections/community.general.git "${ANSIBLE_COLLECTIONS_PATH}/ansible_collections/community/general"
 else
-    target_branch='main'
+    retry git clone --depth=1 --single-branch https://github.com/ansible-collections/community.general.git "${ANSIBLE_COLLECTIONS_PATH}/ansible_collections/community/general"
 fi
-
-retry git clone --depth=1 --single-branch -b "${target_branch}" https://github.com/ansible-collections/community.general.git "${ANSIBLE_COLLECTIONS_PATH}/ansible_collections/community/general"
-
 # Note:  we're installing with git to work around Galaxy being a huge PITA (https://github.com/ansible/galaxy/issues/2429)
 # END: HACK