Merge c77c592fc6 into 12a1c25f5e

Update azure-pipelines for new RHEL versions

SUMMARY

Change to the CI system annnounced in the following required this change:
ansible-collections/news-for-maintainers#47

.azure-pipelines/azure-pipelines.yml

@@ -53,8 +53,8 @@ stages:
           targets:
             - name: CentOS 7
               test: centos7
-            - name: Fedora 37
+            - name: Fedora 38
-              test: fedora37
+              test: fedora38
             - name: openSUSE 15 py3
               test: opensuse15
             - name: Ubuntu 20.04
@@ -213,14 +213,14 @@ stages:
               test: macos/13.2
             - name: RHEL 7.9
               test: rhel/7.9
-            - name: RHEL 8.7
+            - name: RHEL 8.8
-              test: rhel/8.7
+              test: rhel/8.8
-            - name: RHEL 9.1
+            - name: RHEL 9.2
-              test: rhel/9.1
+              test: rhel/9.2
             - name: FreeBSD 12.4
               test: freebsd/12.4
-            - name: FreeBSD 13.1
+            - name: FreeBSD 13.2
-              test: freebsd/13.1
+              test: freebsd/13.2
   - stage: Remote_2_15
     displayName: Remote 2.15
     dependsOn: []

changelogs/fragments/346-boot-linux.yml

@@ -0,0 +1,3 @@
+---
+bugfix:
+  - mount - Handle ``boot`` option on Linux, NetBSD and OpenBSD correctly (https://github.com/ansible-collections/ansible.posix/issues/364).

changelogs/fragments/477_ci_update.yml

@@ -0,0 +1,3 @@
+---
+trivial:
+  - "Drop Python3.9 and update versions of RHEL,Fedora and FreeBSD for ansible-core:devel test(https://github.com/ansible-collections/ansible.posix/issues/476)."

plugins/modules/mount.py

@@ -835,11 +835,8 @@ def main():
             args['warnings'].append("Ignore the 'boot' due to 'opts' contains 'noauto'.")
         elif not module.params['boot']:
             args['boot'] = 'no'
-            if 'defaults' in opts:
+            opts.append('noauto')
-                args['warnings'].append("Ignore the 'boot' due to 'opts' contains 'defaults'.")
+            args['opts'] = ','.join(opts)
-            else:
-                opts.append('noauto')
-                args['opts'] = ','.join(opts)
 
     # If fstab file does not exist, we first need to create it. This mainly
     # happens when fstab option is passed to the module.

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

@@ -367,6 +367,25 @@
       path: /tmp/myfs
       state: absent
 
+  - name: Mount the FS with noauto option and defaults
+    mount:
+      path: /tmp/myfs
+      src: /tmp/myfs.img
+      fstype: ext3
+      state: mounted
+      boot: no
+    register: mount_info
+
+  - name: assert the mount without noauto was successful
+    assert:
+      that:
+      - "'noauto' in mount_info['opts'].split(',')"
+
+  - name: Unmount FS
+    mount:
+      path: /tmp/myfs
+      state: absent
+
   - name: Remove the test FS
     file:
       path: '{{ item }}'

tests/utils/shippable/shippable.sh

@@ -145,9 +145,7 @@ function cleanup
         fi
 
         if [ "${process_coverage}" ]; then
-            # use python 3.9 for coverage to avoid running out of memory during coverage xml processing
+            python3 -m venv ~/ansible-venv
-            # only use it for coverage to avoid the additional overhead of setting up a virtual environment for a potential no-op job
-            virtualenv --python /usr/bin/python3.9 ~/ansible-venv
             set +ux
             . ~/ansible-venv/bin/activate
             set -ux