Merge c77c592fc6 into 2f699307c7

Merge pull request #508 from saito-hideki/pr/refactoring_ci_remote
[CI] Refactoring CI tests for both remote and container tests SUMMARY Refactored CI tests: Remove tests for Ansible Core 2.10 and 2.11 that already reached EOL. Remote test target of ansible.posix will be the latest version of RHEL8,9 only. The target OS of container tests has been modified, and a few OS have been removed Add Ansible Core 2.16 and new devel branch to container and remote test target. #506 For CI testing, other platforms can be added as needed. ISSUE TYPE CI tests Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION None
2026-01-12 23:55:19 +01:00 · 2023-11-17 23:19:45 +00:00 · 2023-11-16 04:34:53 +00:00 · 2023-11-16 11:56:08 +09:00 · 2022-05-24 07:10:54 +02:00 · 2022-05-23 22:52:38 +02:00
5 changed files with 57 additions and 107 deletions
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@ -51,16 +51,29 @@ stages:
        parameters:
          testFormat: devel/linux/{0}/1
          targets:
-            - name: CentOS 7
-              test: centos7
            - name: Fedora 38
              test: fedora38
-            - name: openSUSE 15 py3
-              test: opensuse15
            - name: Ubuntu 20.04
              test: ubuntu2004
            - name: Ubuntu 22.04
              test: ubuntu2204
+  - stage: Docker_2_16
+    displayName: Docker 2.16
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.16/linux/{0}/1
+          targets:
+            - name: CentOS 7
+              test: centos7
+            - name: Fedora 38
+              test: fedora38
+            - name: Ubuntu 20.04
+              test: ubuntu2004
+            - name: Ubuntu 22.04
+              test: ubuntu2204
+
  - stage: Docker_2_15
    displayName: Docker 2.15
    dependsOn: []
@ -141,44 +154,6 @@ stages:
              test: ubuntu1804
            - name: Ubuntu 20.04
              test: ubuntu2004
-  - stage: Docker_2_11
-    displayName: Docker 2.11
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.11/linux/{0}/1
-          targets:
-            - name: CentOS 6
-              test: centos6
-            - name: CentOS 7
-              test: centos7
-            - name: openSUSE 15 py2
-              test: opensuse15py2
-            - name: openSUSE 15 py3
-              test: opensuse15
-            - name: Ubuntu 18.04
-              test: ubuntu1804
-  - stage: Docker_2_10
-    displayName: Docker 2.10
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.10/linux/{0}/1
-          targets:
-            - name: CentOS 6
-              test: centos6
-            - name: CentOS 7
-              test: centos7
-            - name: openSUSE 15 py2
-              test: opensuse15py2
-            - name: openSUSE 15 py3
-              test: opensuse15
-            - name: Ubuntu 16.04
-              test: ubuntu1604
-            - name: Ubuntu 18.04
-              test: ubuntu1804
  - stage: Docker_2_9
    displayName: Docker 2.9
    dependsOn: []
@ -209,16 +184,21 @@ stages:
        parameters:
          testFormat: devel/{0}/1
          targets:
-            - name: MacOS 13.2
-              test: macos/13.2
-            - name: RHEL 7.9
-              test: rhel/7.9
+            - name: RHEL 9.3
+              test: rhel/9.3
+  - stage: Remote_2_16
+    displayName: Remote 2.16
+    dependsOn: []
+    jobs:
+      - template: templates/matrix.yml
+        parameters:
+          testFormat: 2.16/{0}/1
+          targets:
            - name: RHEL 8.8
              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
    dependsOn: []
@ -227,18 +207,12 @@ stages:
        parameters:
          testFormat: 2.15/{0}/1
          targets:
-            - name: MacOS 13.2
-              test: macos/13.2
            - name: RHEL 7.9
              test: rhel/7.9
            - name: RHEL 8.7
              test: rhel/8.7
            - name: RHEL 9.1
              test: rhel/9.1
-            - name: FreeBSD 12.4
-              test: freebsd/12.4
-            - name: FreeBSD 13.1
-              test: freebsd/13.1
  - stage: Remote_2_14
    displayName: Remote 2.14
    dependsOn: []
@ -247,18 +221,10 @@ stages:
        parameters:
          testFormat: 2.14/{0}/1
          targets:
-            - name: MacOS 12.0
-              test: macos/12.0
            - name: RHEL 7.9
              test: rhel/7.9
            - name: RHEL 8.6
              test: rhel/8.6
-            - name: RHEL 9.0
-              test: rhel/9.0
-            - name: FreeBSD 12.3
-              test: freebsd/12.3
-            - name: FreeBSD 13.1
-              test: freebsd/13.1
  - stage: Remote_2_13
    displayName: Remote 2.13
    dependsOn: []
@ -267,16 +233,10 @@ stages:
        parameters:
          testFormat: 2.13/{0}/1
          targets:
-            - name: MacOS 12.0
-              test: macos/12.0
            - name: RHEL 7.9
              test: rhel/7.9
            - name: RHEL 8.5
              test: rhel/8.5
-            - name: FreeBSD 12.3
-              test: freebsd/12.3
-            - name: FreeBSD 13.0
-              test: freebsd/13.0
  - stage: Remote_2_12
    displayName: Remote 2.12
    dependsOn: []
@ -285,40 +245,10 @@ stages:
        parameters:
          testFormat: 2.12/{0}/1
          targets:
-            - name: MacOS 11.1
-              test: macos/11.1
            - name: RHEL 7.9
              test: rhel/7.9
            - name: RHEL 8.4
              test: rhel/8.4
-            - name: FreeBSD 13.0
-              test: freebsd/13.0
-  - stage: Remote_2_11
-    displayName: Remote 2.11
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.11/{0}/1
-          targets:
-            - name: MacOS 11.1
-              test: macos/11.1
-            - name: RHEL 7.9
-              test: rhel/7.9
-            - name: RHEL 8.3
-              test: rhel/8.3
-  - stage: Remote_2_10
-    displayName: Remote 2.10
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.10/{0}/1
-          targets:
-            - name: RHEL 7.9
-              test: rhel/7.9
-            - name: RHEL 8.2
-              test: rhel/8.2
  - stage: Remote_2_9
    displayName: Remote 2.9
    dependsOn: []
@ -339,10 +269,6 @@ stages:
    dependsOn:
      - Remote_2_9
      - Docker_2_9
-      - Remote_2_10
-      - Docker_2_10
-      - Remote_2_11
-      - Docker_2_11
      - Remote_2_12
      - Docker_2_12
      - Remote_2_13
@ -351,6 +277,8 @@ stages:
      - Docker_2_14
      - Remote_2_15
      - Docker_2_15
+      - Remote_2_16
+      - Docker_2_16
      - Remote_devel
      - Docker_devel
    jobs:
--- a/changelogs/fragments/346-boot-linux.yml
+++ b/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).
--- a/changelogs/fragments/508_ci_update.yml
+++ b/changelogs/fragments/508_ci_update.yml
@ -0,0 +1,3 @@
+---
+trivial:
+  - "Refactoring remote CI targets."
--- a/plugins/modules/mount.py
+++ b/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:
-                args['warnings'].append("Ignore the 'boot' due to 'opts' contains 'defaults'.")
-            else:
-                opts.append('noauto')
-                args['opts'] = ','.join(opts)
+            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.
--- a/tests/integration/targets/mount/tasks/main.yml
+++ b/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 }}'
Author	SHA1	Message	Date
copyrights	ca1e2687cf	Merge `c77c592fc6` into `2f699307c7`	2023-11-17 23:19:45 +00:00
softwarefactory-project-zuul[bot]	2f699307c7	Merge pull request #508 from saito-hideki/pr/refactoring_ci_remote [CI] Refactoring CI tests for both remote and container tests SUMMARY Refactored CI tests: Remove tests for Ansible Core 2.10 and 2.11 that already reached EOL. Remote test target of ansible.posix will be the latest version of RHEL8,9 only. The target OS of container tests has been modified, and a few OS have been removed Add Ansible Core 2.16 and new devel branch to container and remote test target. #506 For CI testing, other platforms can be added as needed. ISSUE TYPE CI tests Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION None	2023-11-16 04:34:53 +00:00
Hideki Saito	7dd5087e7b	Refactoring remote and docker CI tests. * Removed tests for Ansible Core 2.10 and 2.11 fromn remote and container targets * Modoifed remote and container test target OS * Fixed #506 Signed-off-by: Hideki Saito <saito@fgrep.org>	2023-11-16 11:56:08 +09:00
copyrights	c77c592fc6	add changelog fragment	2022-05-24 07:10:54 +02:00
copyrights	02006a1e7f	add mount boot test	2022-05-23 22:52:38 +02:00
copyrights	1512495dd7	mount: remove boot exception if defaults in opts	2022-05-23 22:21:11 +02:00