Merge 7d8da00f79 into 44a2151dbf

.azure-pipelines/azure-pipelines.yml

@@ -122,14 +122,14 @@ stages:
         parameters:
           testFormat: devel/linux/{0}/1
           targets:
-            - name: Fedora 41
+            - name: Fedora 40
-              test: fedora41
+              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
@@ -201,14 +201,14 @@ stages:
         parameters:
           testFormat: devel/{0}/1
           targets:
-            - name: RHEL 9.5
+            - name: RHEL 9.4
-              test: rhel/9.5
+              test: rhel/9.4
-            - name: FreeBSD 14.2
+            - name: FreeBSD 14.1
-              test: freebsd/14.2
+              test: freebsd/14.1
-            - name: FreeBSD 13.5
+            - name: FreeBSD 13.4
-              test: freebsd/13.5
+              test: freebsd/13.4
   - stage: Remote_2_18
-    displayName: Remote 2.18
+    displayName: Remote devel
     dependsOn: []
     jobs:
       - template: templates/matrix.yml

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

@@ -134,7 +134,7 @@
   register: bind_result_freebsd_dry_run
   check_mode: true
 
-- name: Attempt to stat bind mounted file
+- name: attempt to stat bind mounted file
   ansible.builtin.stat:
     path: '{{ output_dir }}/mount_dest/test_file'
   when: ansible_system in ('FreeBSD', 'Linux')
@@ -143,7 +143,11 @@
 - name: Assert the bind mount did not take place
   ansible.builtin.assert:
     that:
+      - linux_and_changed or freebsd_and_changed
       - not dest_stat['stat']['exists']
+  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')
 
 # bind mount
@@ -326,12 +330,12 @@
   when: ansible_system in ('FreeBSD', 'Linux')
 
 # SWAP #############################################################
-- name: Swap
+- name: swap
   when: ansible_system in ('Linux')
   block:
     # mount swap check mode
     - name: Stat /etc/fstab
-      ansible.builtin.stat:
+      stat:
         path: /etc/fstab
       register: stat_fstab_before
 
@@ -345,7 +349,7 @@
       check_mode: true
 
     - name: Stat /etc/fstab
-      ansible.builtin.stat:
+      stat:
         path: /etc/fstab
       register: stat_fstab_after
 
@@ -406,7 +410,7 @@
 
     # remove swap check mode
     - name: Stat /etc/fstab
-      ansible.builtin.stat:
+      stat:
         path: /etc/fstab
       register: stat_fstab_before
 
@@ -418,7 +422,7 @@
       check_mode: true
 
     - name: Stat /etc/fstab
-      ansible.builtin.stat:
+      stat:
         path: /etc/fstab
       register: stat_fstab_after
 
@@ -470,7 +474,7 @@
           - not swap2_removed_again['changed']
 
 # FIXUP #############################################################
-- name: Fix incomplete entry already present in fstab
+- name: fix incomplete entry already present in fstab
   when: ansible_system == 'Linux'
   block:
     - name: Create fstab record with missing last two fields
@@ -830,7 +834,7 @@
       failed_when: false
       changed_when: false
 
-    - name: Assert the mount occurred and the fstab is unchanged
+    - name: Assert the mount occured and the fstab is unchanged
       ansible.builtin.assert:
         that:
           - check_mountinfo.stdout|int == 0

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