Merge pull request #600 from saito-hideki/release_2.0.0

Release 2.0.0 commit SUMMARY Release 2.0.0 commit Release Plan #149 ISSUE TYPE Feature Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION This will be merged on 5 December if there are no problems Reviewed-by: Adam Miller <admiller@redhat.com> Reviewed-by: Andrew Klychkov <aklychko@redhat.com>
Release 2.0.0 commit
2026-03-26 21:33:32 +00:00 · 2024-12-05 00:48:30 +00:00 · 2024-12-04 09:46:44 +09:00 · 2024-12-02 23:50:26 +00:00 · 2024-11-29 02:59:28 +00:00 · 2024-11-29 03:34:14 +01:00
13 changed files with 49 additions and 456 deletions
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -57,23 +57,8 @@ stages:
              test: units
            - name: Lint
              test: lint
-  - stage: Sanity_2_19
-    displayName: Ansible 2.19 sanitay & Units & Lint
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: "{0}"
-          testFormat: 2.19/{0OI}
-          targets:
-            - name: Sanity
-              test: sanity
-            - name: Units
-              test: units
-            - name: Lint
-              test: lint
  - stage: Sanity_2_18
-    displayName: Ansible 2.18 sanity & Units & Lint
+    displayName: Ansible 2.18 sanity
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
@@ -88,11 +73,10 @@ stages:
            - name: Lint
              test: lint
  - stage: Sanity_2_17
-    displayName: Ansible 2.17 sanity & Units & Lint
+    displayName: Ansible 2.17 sanity
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
-        I
        parameters:
          nameFormat: "{0}"
          testFormat: 2.17/{0}
@@ -104,7 +88,7 @@ stages:
            - name: Lint
              test: lint
  - stage: Sanity_2_16
-    displayName: Ansible 2.16 sanity & Units & Lint
+    displayName: Ansible 2.16 sanity
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
@@ -117,7 +101,7 @@ stages:
            - name: Units
              test: units
  - stage: Sanity_2_15
-    displayName: Ansible 2.15 sanity & Units & Lint
+    displayName: Ansible 2.15 sanity
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
@@ -138,28 +122,14 @@ stages:
        parameters:
          testFormat: devel/linux/{0}/1
          targets:
-            - name: Fedora 41
-              test: fedora41
-            - name: Ubuntu 22.04
-              test: ubuntu2204
-            - name: Ubuntu 24.04
-              test: ubuntu2404
-  - stage: Docker_2_19
-    displayName: Docker 2.19
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: devel/linux/{0}/1
-          targets:
-            - name: Fedora 41
-              test: fedora41
+            - name: Fedora 40
+              test: fedora40
            - name: Ubuntu 22.04
              test: ubuntu2204
            - name: Ubuntu 24.04
              test: ubuntu2404
  - stage: Docker_2_18
-    displayName: Docker 2.18
+    displayName: Docker devel
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
@@ -182,6 +152,8 @@ stages:
          targets:
            - name: Fedora 39
              test: fedora39
+            - name: Ubuntu 20.04
+              test: ubuntu2004
            - name: Ubuntu 22.04
              test: ubuntu2204
  - stage: Docker_2_16
@@ -196,6 +168,8 @@ stages:
              test: centos7
            - name: Fedora 38
              test: fedora38
+            - name: Ubuntu 20.04
+              test: ubuntu2004
            - name: Ubuntu 22.04
              test: ubuntu2204

@@ -213,6 +187,8 @@ stages:
              test: fedora37
            - name: openSUSE 15 py3
              test: opensuse15
+            - name: Ubuntu 20.04
+              test: ubuntu2004
            - name: Ubuntu 22.04
              test: ubuntu2204

@@ -225,32 +201,14 @@ 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
-              test: freebsd/14.2
-            - name: FreeBSD 13.5
-              test: freebsd/13.5
-  - stage: Remote_2_19
-    displayName: Remote 2.19
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        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
-              test: freebsd/14.2
-            - name: FreeBSD 13.5
-              test: freebsd/13.5
+            - name: RHEL 9.4
+              test: rhel/9.4
+            - name: FreeBSD 14.1
+              test: freebsd/14.1
+            - name: FreeBSD 13.4
+              test: freebsd/13.4
  - stage: Remote_2_18
-    displayName: Remote 2.18
+    displayName: Remote devel
    dependsOn: []
    jobs:
      - template: templates/matrix.yml
@@ -285,6 +243,8 @@ 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
@@ -300,6 +260,8 @@ stages:
              test: rhel/8.7
            - name: RHEL 9.1
              test: rhel/9.1
+            - name: FreeBSD 13.2
+              test: freebsd/13.2

  ## Finally

@@ -318,9 +280,6 @@ stages:
      - Sanity_2_18
      - Remote_2_18
      - Docker_2_18
-      - Sanity_2_19
-      - Remote_2_19
-      - Docker_2_19
      - Sanity_devel
      - Remote_devel
      - Docker_devel
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,27 +4,6 @@ ansible.posix Release Notes

 .. contents:: Topics

-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
 ======

--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -490,25 +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'
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -1,7 +1,7 @@
 ---
 namespace: ansible
 name: posix
-version: 2.1.0
+version: 2.0.0
 readme: README.md
 authors:
  - Ansible (github.com/ansible)
--- a/plugins/callback/cgroup_perf_recap.py
+++ b/plugins/callback/cgroup_perf_recap.py
@@ -132,7 +132,6 @@ DOCUMENTATION = '''

 import csv
 import datetime
-import json
 import os
 import time
 import threading
@@ -143,7 +142,7 @@ from functools import partial

 from ansible.module_utils._text import to_bytes, to_text
 from ansible.module_utils.six import with_metaclass
-from ansible.parsing.ajson import AnsibleJSONEncoder
+from ansible.parsing.ajson import AnsibleJSONEncoder, json
 from ansible.plugins.callback import CallbackBase


--- a/plugins/callback/profile_roles.py
+++ b/plugins/callback/profile_roles.py
@@ -124,7 +124,10 @@ class CallbackModule(CallbackBase):
    def v2_playbook_on_handler_task_start(self, task):
        self._record_task(task)

-    def v2_playbook_on_stats(self, stats):
+    def playbook_on_setup(self):
+        self._display_tasktime()
+
+    def playbook_on_stats(self, stats):
        # Align summary report header with other callback plugin summary
        self._display.banner("ROLES RECAP")

--- a/plugins/callback/profile_tasks.py
+++ b/plugins/callback/profile_tasks.py
@@ -189,7 +189,10 @@ class CallbackModule(CallbackBase):
    def v2_playbook_on_handler_task_start(self, task):
        self._record_task(task)

-    def v2_playbook_on_stats(self, stats):
+    def playbook_on_setup(self):
+        self._display_tasktime()
+
+    def playbook_on_stats(self, stats):
        # Align summary report header with other callback plugin summary
        self._display.banner("TASKS RECAP")

--- a/tests/integration/targets/acl/tasks/acl.yml
+++ b/tests/integration/targets/acl/tasks/acl.yml
@@ -46,12 +46,6 @@
    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:
--- a/tests/integration/targets/mount/tasks/main.yml
+++ b/tests/integration/targets/mount/tasks/main.yml
@@ -1,4 +1,3 @@
-# SETUP ################################################################################
 - name: Install dependencies (Linux)
  ansible.builtin.package:
    name: e2fsprogs
@@ -111,42 +110,6 @@
    mode: '0644'
  register: orig_info

-# BIND MOUNT ################################################################################
-# bind mount check mode
- name: Bind mount a filesystem (Linux) (check mode)
-  ansible.posix.mount:
-    src: '{{ output_dir }}/mount_source'
-    name: '{{ output_dir }}/mount_dest'
-    state: mounted
-    fstype: None
-    opts: bind
-  when: ansible_system == 'Linux'
-  register: bind_result_linux_dry_run
-  check_mode: true
-
- name: Bind mount a filesystem (FreeBSD) (check mode)
-  ansible.posix.mount:
-    src: '{{ output_dir }}/mount_source'
-    name: '{{ output_dir }}/mount_dest'
-    state: mounted
-    fstype: nullfs
-  when: ansible_system == 'FreeBSD'
-  register: bind_result_freebsd_dry_run
-  check_mode: true
-
- name: Attempt to stat bind mounted file
-  ansible.builtin.stat:
-    path: '{{ output_dir }}/mount_dest/test_file'
-  when: ansible_system in ('FreeBSD', 'Linux')
-  register: dest_stat
-
- name: Assert the bind mount did not take place
-  ansible.builtin.assert:
-    that:
-      - not dest_stat['stat']['exists']
-  when: ansible_system in ('FreeBSD', 'Linux')
-
-# bind mount
 - name: Bind mount a filesystem (Linux)
  ansible.posix.mount:
    src: '{{ output_dir }}/mount_source'
@@ -205,48 +168,6 @@
      - (ansible_system == 'Linux' and not bind_result_linux['changed']) or (ansible_system == 'FreeBSD' and not bind_result_freebsd['changed'])
  when: ansible_system in ('FreeBSD', 'Linux')

-# remount check mode
- name: Remount filesystem with different opts (Linux) (check mode)
-  ansible.posix.mount:
-    src: '{{ output_dir }}/mount_source'
-    name: '{{ output_dir }}/mount_dest'
-    state: mounted
-    fstype: None
-    opts: bind,ro
-  when: ansible_system == 'Linux'
-  register: bind_result_linux
-  check_mode: true
-
- name: Remount filesystem with different opts (FreeBSD) (check mode)
-  ansible.posix.mount:
-    src: '{{ output_dir }}/mount_source'
-    name: '{{ output_dir }}/mount_dest'
-    state: mounted
-    fstype: nullfs
-    opts: ro
-  when: ansible_system == 'FreeBSD'
-  register: bind_result_freebsd
-  check_mode: true
-
- name: Get mount options
-  ansible.builtin.shell:
-    cmd: set -o pipefail && mount | grep mount_dest | grep -c -E -w '(ro|read-only)'
-    executable: "{{ shell_executable }}"
-  changed_when: false
-  failed_when: false
-  register: new_options_count
-
- name: Make sure the filesystem does not have the new opts
-  ansible.builtin.assert:
-    that:
-      - linux_and_changed or freebsd_and_changed
-      - new_options_count.stdout | int == 0
-  vars:
-    linux_and_changed: "{{ ansible_system == 'Linux' and bind_result_linux_dry_run['changed'] }}"
-    freebsd_and_changed: "{{ ansible_system == 'FreeBSD' and bind_result_freebsd['changed'] }}"
-  when: ansible_system in ('FreeBSD', 'Linux')
-
-# remount
 - name: Remount filesystem with different opts (Linux)
  ansible.posix.mount:
    src: '{{ output_dir }}/mount_source'
@@ -282,29 +203,6 @@
      - 1 == remount_options.stdout_lines | length
  when: ansible_system in ('FreeBSD', 'Linux')

-# unmount check mode
- name: Unmount the bind mount (check mode)
-  ansible.posix.mount:
-    name: '{{ output_dir }}/mount_dest'
-    state: absent
-  when: ansible_system in ('Linux', 'FreeBSD')
-  register: unmount_result
-  check_mode: true
-
- name: Make sure the file still exists in dest
-  ansible.builtin.stat:
-    path: '{{ output_dir }}/mount_dest/test_file'
-  when: ansible_system in ('FreeBSD', 'Linux')
-  register: dest_stat
-
- name: Check that we did not unmount
-  ansible.builtin.assert:
-    that:
-      - unmount_result['changed']
-      - dest_stat['stat']['exists']
-  when: ansible_system in ('FreeBSD', 'Linux')
-
-# unmount
 - name: Unmount the bind mount
  ansible.posix.mount:
    name: '{{ output_dir }}/mount_dest'
@@ -325,36 +223,9 @@
      - not dest_stat['stat']['exists']
  when: ansible_system in ('FreeBSD', 'Linux')

-# SWAP #############################################################
- name: Swap
+- name: Block to test remounted option
  when: ansible_system in ('Linux')
  block:
-    # mount swap check mode
-    - name: Stat /etc/fstab
-      ansible.builtin.stat:
-        path: /etc/fstab
-      register: stat_fstab_before
-
-    - name: Create fstab record for the first swap file (check mode)
-      ansible.posix.mount:
-        name: none
-        src: /tmp/swap1
-        opts: sw
-        fstype: swap
-        state: present
-      check_mode: true
-
-    - name: Stat /etc/fstab
-      ansible.builtin.stat:
-        path: /etc/fstab
-      register: stat_fstab_after
-
-    - name: Assert that fstab checksum did not change
-      ansible.builtin.assert:
-        that:
-          - stat_fstab_before.stat.checksum == stat_fstab_after.stat.checksum
-
-    # mount swap1
    - name: Create fstab record for the first swap file
      ansible.posix.mount:
        name: none
@@ -379,7 +250,6 @@
          - swap1_created['changed']
          - not swap1_created_again['changed']

-    # mount swap2
    - name: Create fstab record for the second swap file
      ansible.posix.mount:
        name: none
@@ -404,30 +274,6 @@
          - swap2_created['changed']
          - not swap2_created_again['changed']

-    # remove swap check mode
-    - name: Stat /etc/fstab
-      ansible.builtin.stat:
-        path: /etc/fstab
-      register: stat_fstab_before
-
-    - name: Remove the fstab record for the first swap file (check mode)
-      ansible.posix.mount:
-        name: none
-        src: /tmp/swap1
-        state: absent
-      check_mode: true
-
-    - name: Stat /etc/fstab
-      ansible.builtin.stat:
-        path: /etc/fstab
-      register: stat_fstab_after
-
-    - name: Assert that fstab checksum did not change
-      ansible.builtin.assert:
-        that:
-          - stat_fstab_before.stat.checksum == stat_fstab_after.stat.checksum
-
-    # remove swap1
    - name: Remove the fstab record for the first swap file
      ansible.posix.mount:
        name: none
@@ -448,7 +294,6 @@
          - swap1_removed['changed']
          - not swap1_removed_again['changed']

-    # remove swap2
    - name: Remove the fstab record for the second swap file
      ansible.posix.mount:
        name: none
@@ -469,10 +314,6 @@
          - swap2_removed['changed']
          - not swap2_removed_again['changed']

-# FIXUP #############################################################
- name: Fix incomplete entry already present in fstab
-  when: ansible_system == 'Linux'
-  block:
    - name: Create fstab record with missing last two fields
      ansible.builtin.copy:
        dest: /etc/fstab
@@ -502,11 +343,6 @@
          - ''' 0 0'' in optional_fields_content.stdout'
          - 1 == optional_fields_content.stdout_lines | length

-# REMOUNTED #############################################################
- name: Block to test remounted option
-  when: ansible_system in ('Linux')
-  block:
-    # setup
    - name: Create empty file
      community.general.filesize:
        path: /tmp/myfs.img
@@ -536,26 +372,6 @@
      ansible.builtin.pause:
        seconds: 2

-    # remount check mode
-    - name: Remount (check mode)
-      ansible.posix.mount:
-        path: /tmp/myfs
-        state: remounted
-
-    - name: Get again the last write time
-      ansible.builtin.shell:
-        cmd: >-
-          set -o pipefail && dumpe2fs /tmp/myfs.img 2>/dev/null | grep -i "last write time:" |cut -d: -f2-
-        executable: "{{ shell_executable }}"
-      changed_when: false
-      register: last_write_time_check
-
-    - name: Fail if they are different
-      ansible.builtin.fail:
-        msg: Filesytem was remounted, testing of the module failed!
-      when: last_write_time.stdout != last_write_time_check.stdout
-
-    # remount
    - name: Test if the FS is remounted
      ansible.posix.mount:
        path: /tmp/myfs
@@ -574,29 +390,6 @@
        msg: Filesytem was not remounted, testing of the module failed!
      when: last_write is defined and last_write_time2 is defined and last_write_time.stdout == last_write_time2.stdout

-    # remount different options check mode
-    - name: Remount filesystem with different opts using remounted option (Linux only)
-      ansible.posix.mount:
-        path: /tmp/myfs
-        state: remounted
-        opts: rw,noexec
-      check_mode: true
-
-    - name: Get remounted options (Linux only)
-      ansible.builtin.shell:
-        cmd: set -o pipefail && mount | grep myfs | grep -E -w 'noexec' | wc -l
-        executable: "{{ shell_executable }}"
-      failed_when: false
-      changed_when: false
-      register: remounted_options
-
-    - name: Make sure the filesystem now has the new opts after using remounted (Linux only)
-      ansible.builtin.assert:
-        that:
-          - "'0' in remounted_options.stdout"
-          - "1 == remounted_options.stdout_lines | length"
-
-    # remount different options
    - name: Remount filesystem with different opts using remounted option (Linux only)
      ansible.posix.mount:
        path: /tmp/myfs
@@ -616,7 +409,6 @@
          - "'1' in remounted_options.stdout"
          - "1 == remounted_options.stdout_lines | length"

-    # backup
    - name: Mount the FS again to test backup
      ansible.posix.mount:
        path: /tmp/myfs
@@ -647,11 +439,9 @@
        - /tmp/myfs.img
        - /tmp/myfs

-# BOOT #############################################################
 - name: Block to test boot option for Linux
  when: ansible_system in ('Linux')
  block:
-    # setup
    - name: Create empty file
      community.general.filesize:
        path: /tmp/myfs.img
@@ -662,7 +452,6 @@
        fstype: ext3
        dev: /tmp/myfs.img

-    # noauto
    - name: Mount the FS with noauto option
      ansible.posix.mount:
        path: /tmp/myfs
@@ -683,7 +472,6 @@
        path: /tmp/myfs
        state: absent

-    # noauto + defaults
    - name: Mount the FS with noauto option and defaults
      ansible.posix.mount:
        path: /tmp/myfs
@@ -711,7 +499,6 @@
        - /tmp/myfs.img
        - /tmp/myfs

-# NEWLINE END OF FILE ############################################
 - name: Block to test missing newline at the EOF of fstab
  when: ansible_system in ('Linux')
  block:
@@ -750,7 +537,6 @@
        - /tmp/myfs1
        - /tmp/test_fstab

-# EPHEMERAL ################################################
 - name: Block to test ephemeral option
  environment:
    PATH: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
@@ -766,7 +552,8 @@
        path: /tmp/myfs_B.img
        size: 20M

-    ##### FORMAT FS ON LINUX
+  ##### FORMAT FS ON LINUX
+
    - name: Block to format FS on Linux
      when: ansible_system == 'Linux'
      block:
@@ -780,7 +567,8 @@
            fstype: ext3
            dev: /tmp/myfs_B.img

-    ##### FORMAT FS ON SOLARIS AND BSD
+  ##### FORMAT FS ON SOLARIS AND BSD
+
    - name: Create loop devices on Solaris and BSD
      ansible.builtin.shell:
        cmd: "set -o pipefail && {{ ephemeral_create_loop_dev_cmd }}"
@@ -795,49 +583,14 @@
      changed_when: true
      when: ephemeral_format_fs_cmd is defined

+  ##### TESTS
+
    - name: Create fstab if it does not exist
      ansible.builtin.file:
        path: "{{ ephemeral_fstab }}"
        state: touch
        mode: '0644'

-    # normal ephemeral mount check mode
-    - name: Get checksum of /etc/fstab before mounting anything
-      ansible.builtin.stat:
-        path: '{{ ephemeral_fstab }}'
-      register: fstab_stat_before_mount
-
-    - name: Mount the FS A with ephemeral state (check mode)
-      ansible.posix.mount:
-        path: /tmp/myfs
-        src: '{{ ephemeral_device_a }}'
-        fstype: '{{ ephemeral_fstype }}'
-        opts: rw
-        state: ephemeral
-      register: ephemeral_mount_info
-      check_mode: true
-
-    - name: Get checksum of /etc/fstab after an ephemeral mount
-      ansible.builtin.stat:
-        path: '{{ ephemeral_fstab }}'
-      register: fstab_stat_after_mount
-
-    - name: Get mountinfo
-      ansible.builtin.shell:
-        cmd: grep -c '/tmp/myfs' <(mount -v)
-        executable: "{{ shell_executable }}"
-      register: check_mountinfo
-      failed_when: false
-      changed_when: false
-
-    - name: Assert the mount occurred and the fstab is unchanged
-      ansible.builtin.assert:
-        that:
-          - check_mountinfo.stdout|int == 0
-          - ephemeral_mount_info['changed']
-          - fstab_stat_before_mount['stat']['checksum'] == fstab_stat_after_mount['stat']['checksum']
-
-    # normal ephemeral mount
    - name: Get checksum of /etc/fstab before mounting anything
      ansible.builtin.stat:
        path: '{{ ephemeral_fstab }}'
@@ -878,48 +631,6 @@
          - ephemeral_mount_info['changed']
          - fstab_stat_before_mount['stat']['checksum'] == fstab_stat_after_mount['stat']['checksum']

-    # remount different options check mode
-    - name: Get first mount record
-      ansible.builtin.shell:
-        cmd: grep '/tmp/myfs' <(mount -v)
-        executable: "{{ shell_executable }}"
-      register: ephemeral_mount_record_1
-      changed_when: false
-
-    - name: Try to mount FS A where FS A is already mounted (should trigger remount and changed)
-      ansible.posix.mount:
-        path: /tmp/myfs
-        src: '{{ ephemeral_device_a }}'
-        fstype: '{{ ephemeral_fstype }}'
-        opts: ro
-        state: ephemeral
-      register: ephemeral_mount_info
-      check_mode: true
-
-    - name: Get second mount record (should be different than the first)
-      ansible.builtin.shell:
-        cmd: grep '/tmp/myfs' <(mount -v)
-        executable: "{{ shell_executable }}"
-      register: ephemeral_mount_record_2
-      changed_when: false
-
-    - name: Get mountinfo
-      ansible.builtin.shell:
-        cmd: grep -c '/tmp/myfs' <(mount -v)
-        executable: "{{ shell_executable }}"
-      failed_when: false
-      register: check_mountinfo
-      changed_when: false
-
-    - name: Assert the FS A is still mounted, the options unchanged and the fstab unchanged
-      ansible.builtin.assert:
-        that:
-          - check_mountinfo.stdout|int == 1
-          - ephemeral_mount_record_1.stdout == ephemeral_mount_record_2.stdout
-          - ephemeral_mount_info['changed']
-          - fstab_stat_before_mount['stat']['checksum'] == fstab_stat_after_mount['stat']['checksum']
-
-    # remount different options
    - name: Get first mount record
      ansible.builtin.shell:
        cmd: grep '/tmp/myfs' <(mount -v)
@@ -959,7 +670,6 @@
          - ephemeral_mount_info['changed']
          - fstab_stat_before_mount['stat']['checksum'] == fstab_stat_after_mount['stat']['checksum']

-    # conflicting mount
    - name: Try to mount file B on file A mountpoint (should fail)
      ansible.posix.mount:
        path: /tmp/myfs
@@ -997,39 +707,6 @@
          - test_file_stat['stat']['exists']
          - ephemeral_mount_b_info is failed

-    # unmount check mode
-    - name: Unmount FS with state = unmounted
-      ansible.posix.mount:
-        path: /tmp/myfs
-        state: unmounted
-      check_mode: true
-
-    - name: Get fstab checksum after unmounting an ephemeral mount with state = unmounted
-      ansible.builtin.stat:
-        path: '{{ ephemeral_fstab }}'
-      register: fstab_stat_after_unmount
-
-    - name: Get mountinfo
-      ansible.builtin.shell:
-        cmd: grep -c '/tmp/myfs' <(mount -v)
-        executable: "{{ shell_executable }}"
-      register: check_mountinfo
-      failed_when: false
-      changed_when: false
-
-    - name: Try to stat our test file
-      ansible.builtin.stat:
-        path: /tmp/myfs/test_file
-      register: test_file_stat
-
-    - name: Assert that unmount did not take place and fstab unchanged
-      ansible.builtin.assert:
-        that:
-          - check_mountinfo.stdout|int == 1
-          - test_file_stat['stat']['exists']
-          - fstab_stat_before_mount['stat']['checksum'] == fstab_stat_after_unmount['stat']['checksum']
-
-    # unmount
    - name: Unmount FS with state = unmounted
      ansible.posix.mount:
        path: /tmp/myfs
@@ -1082,7 +759,6 @@
        - /tmp/myfs_B.img
        - /tmp/myfs

-# OPTS_NO_LOG ######################################
 - name: Block to test opts_no_log option
  when: ansible_system == 'Linux'
  block:
--- a/tests/integration/targets/seboolean/tasks/main.yml
+++ b/tests/integration/targets/seboolean/tasks/main.yml
@@ -20,4 +20,5 @@
  ansible.builtin.include_tasks: seboolean.yml
  when:
    - ansible_selinux is defined
+    - ansible_selinux
    - ansible_selinux.status == 'enabled'
--- a/tests/integration/targets/selinux/tasks/main.yml
+++ b/tests/integration/targets/selinux/tasks/main.yml
@@ -19,21 +19,23 @@
 - name: Debug message for when SELinux is disabled
  ansible.builtin.debug:
    msg: SELinux is disabled
-  when: ansible_selinux is defined and ansible_selinux.status == 'disabled'
+  when: ansible_selinux is defined and not ansible_selinux

 - name: Debug message for when SELinux is enabled and not disabled
  ansible.builtin.debug:
    msg: SELinux is {{ ansible_selinux.status }}
-  when: ansible_selinux is defined
+  when: ansible_selinux is defined and ansible_selinux

 - name: Include_tasks for when SELinux is enabled
  ansible.builtin.include_tasks: selinux.yml
  when:
    - ansible_selinux is defined
+    - ansible_selinux
    - ansible_selinux.status == 'enabled'

 - name: Include tasks for selogin when SELinux is enabled
  ansible.builtin.include_tasks: selogin.yml
  when:
    - ansible_selinux is defined
+    - ansible_selinux
    - ansible_selinux.status == 'enabled'
--- a/tests/sanity/ignore-2.20.txt
+++ b/tests/sanity/ignore-2.20.txt
@@ -1 +0,0 @@
-tests/utils/shippable/timing.py shebang
--- a/tests/utils/shippable/shippable.sh
+++ b/tests/utils/shippable/shippable.sh
@@ -62,15 +62,15 @@ else
    retry pip install "https://github.com/ansible/ansible/archive/stable-${ansible_version}.tar.gz" --disable-pip-version-check
 fi

-export ANSIBLE_COLLECTIONS_PATH="${PWD}/../../../"
+export ANSIBLE_COLLECTIONS_PATHS="${PWD}/../../../"

 # START: HACK install dependencies
 if [ "${ansible_version}" == "2.9" ] || [ "${ansible_version}" == "2.10" ]; then
    # Note: Since community.general 5.x, Ansible Core versions prior to 2.11 are not supported.
    # So we need to use 4.8.1 for Ansible 2.9 and Ansible Engine 2.10.
-    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"
+    retry git clone --depth=1 --single-branch -b 4.8.1 https://github.com/ansible-collections/community.general.git "${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/community/general"
 else
-    retry git clone --depth=1 --single-branch https://github.com/ansible-collections/community.general.git "${ANSIBLE_COLLECTIONS_PATH}/ansible_collections/community/general"
+    retry git clone --depth=1 --single-branch https://github.com/ansible-collections/community.general.git "${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/community/general"
 fi
 # Note:  we're installing with git to work around Galaxy being a huge PITA (https://github.com/ansible/galaxy/issues/2429)
 # END: HACK
Author	SHA1	Message	Date
softwarefactory-project-zuul[bot]	4c6898ee6e	Merge pull request #600 from saito-hideki/release_2.0.0 Release 2.0.0 commit SUMMARY Release 2.0.0 commit Release Plan #149 ISSUE TYPE Feature Pull Request COMPONENT NAME ansible.posix ADDITIONAL INFORMATION This will be merged on 5 December if there are no problems Reviewed-by: Adam Miller <admiller@redhat.com> Reviewed-by: Andrew Klychkov <aklychko@redhat.com>	2024-12-05 00:48:30 +00:00
Hideki Saito	f5eae12146	Release 2.0.0 commit Signed-off-by: Hideki Saito <saito@fgrep.org>	2024-12-04 09:46:44 +09:00
softwarefactory-project-zuul[bot]	f632fad9d4	Merge pull request #598 from saito-hideki/issue/586 [Breaking Change] [firewalld] Change type of icmp_block_inversion option from str to bool SUMMARY Changed the type of icmp_block_inversion option from str to bool Fixes #586 ISSUE TYPE Bugfix Pull Request COMPONENT NAME ansible.posix.firewalld ADDITIONAL INFORMATION Related #582 and #584 Reviewed-by: Adam Miller <admiller@redhat.com> Reviewed-by: Andrew Klychkov <aklychko@redhat.com>	2024-12-02 23:50:26 +00:00
softwarefactory-project-zuul[bot]	74edb72249	Merge pull request #597 from vbotka/mount-fix-comment Remove comment from fstab entry on updating. SUMMARY Fix #595. ISSUE TYPE Bugfix Pull Request COMPONENT NAME ansible.posix.mount ADDITIONAL INFORMATION Reviewed-by: Hideki Saito <saito@fgrep.org> Reviewed-by: Vladimir Botka <vbotka@gmail.com>	2024-11-29 02:59:28 +00:00
Vladimir Botka	91129ed381	Fix changelog fragment module name.	2024-11-29 03:34:14 +01:00
Vladimir Botka	7b8d627552	Changelog fragment added.	2024-11-28 08:17:41 +01:00
Hideki Saito	6175a5028b	Change type of icmp_block_inversion option from str to bool * Fixes #586 Signed-off-by: Hideki Saito <saito@fgrep.org>	2024-11-28 14:19:20 +09:00
Vladimir Botka	8e34860d6c	Fix #595 . Remove comment from fstab entry on updating.	2024-11-21 20:54:27 +01:00