Merge a48d9f1023 into cdb442ea48

Merge pull request #646 from saito-hideki/issue/642
[AZP] Add RHEL10 environment to CI matrix SUMMARY Add RHEL10 environment to CI matrix Fixes #642 ISSUE TYPE Feature Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION N/A
2026-01-11 15:15:26 +01:00 · 2025-06-11 09:55:22 -07:00 · 2025-06-09 10:07:53 +00:00 · 2025-06-09 18:43:43 +09:00 · 2025-05-20 00:22:19 +00:00 · 2025-05-19 18:10:38 +02:00
4 changed files with 13 additions and 5 deletions
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@ -195,6 +195,8 @@ stages:
        parameters:
          testFormat: devel/{0}/1
          targets:
+            - name: RHEL 10.0
+              test: rhel/10.0
            - name: RHEL 9.5
              test: rhel/9.5
            - name: FreeBSD 14.2
@ -237,8 +239,6 @@ stages:
              test: rhel/8.8
            - name: RHEL 9.2
              test: rhel/9.2
-            - name: FreeBSD 13.2
-              test: freebsd/13.2

  - stage: Remote_2_15
    displayName: Remote 2.15
@ -254,8 +254,6 @@ stages:
              test: rhel/8.7
            - name: RHEL 9.1
              test: rhel/9.1
-            - name: FreeBSD 13.2
-              test: freebsd/13.2

  ## Finally

--- a/changelogs/fragments/642_ci_add_rhel10.yml
+++ b/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).
--- a/plugins/modules/mount.py
+++ b/plugins/modules/mount.py
@ -222,6 +222,7 @@ EXAMPLES = r'''
 import errno
 import os
 import platform
+import re

 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.ansible.posix.plugins.module_utils.mount import ismount
@ -731,7 +732,8 @@ def _is_same_mount_src(module, src, mountpoint, linux_mounts):
            not ismount(mountpoint) and
            not is_bind_mounted(module, linux_mounts, mountpoint)):
        return False
-
+    # sanitize src
+    src = re.sub(r'(//[^:]+):([^@]+)@', r'\1@', src)
    # Treat Linux bind mounts
    if platform.system() == 'Linux' and linux_mounts is not None:
        # For Linux bind mounts only: the mount command does not return
--- a/tests/integration/targets/acl/tasks/acl.yml
+++ b/tests/integration/targets/acl/tasks/acl.yml
@ -46,6 +46,12 @@
    path: "{{ test_dir }}"
    state: directory
    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:
Author	SHA1	Message	Date
An Li	a0dc071f08	Merge `a48d9f1023` into `cdb442ea48`	2025-06-11 09:55:22 -07:00
softwarefactory-project-zuul[bot]	cdb442ea48	Merge pull request #646 from saito-hideki/issue/642 [AZP] Add RHEL10 environment to CI matrix SUMMARY Add RHEL10 environment to CI matrix Fixes #642 ISSUE TYPE Feature Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION N/A	2025-06-09 10:07:53 +00:00
saito-hideki	f977bffff2	[AZP] Add RHEL10 environment to CI matrix * Fixes #642 Signed-off-by: saito-hideki <saito@fgrep.org>	2025-06-09 18:43:43 +09:00
softwarefactory-project-zuul[bot]	dabaca4b70	Merge pull request #640 from Klaas-/Klaas-fixCI Remove EOL FreeBSD 13.2 from CI SUMMARY CI seems to be failing for a month, reason is that freebsd 13.2 is no longer valid. See ansible-collections/community.general#8607 ISSUE TYPE Bugfix Pull Request COMPONENT NAME CI Reviewed-by: Felix Fontein <felix@fontein.de> Reviewed-by: Hideki Saito <saito@fgrep.org>	2025-05-20 00:22:19 +00:00
Klaas Demter	26b9b1438d	Remove EOL FreeBSD 13.2 from CI	2025-05-19 18:10:38 +02:00
Kidy Lee	a48d9f1023	Fix sanitize mount src before comparing to mount point for macOS	2025-04-14 13:20:19 +08:00