progress ....

Signed-off-by: Adam Miller <admiller@redhat.com>

tests/integration/targets/authorized_key/tasks/comments.yml

@@ -20,9 +20,7 @@
   register: result
 
 - name: Get the file content
-  ansible.builtin.shell:
+  ansible.builtin.command: fgrep DATA_BASIC "{{ output_dir | expanduser }}/authorized_keys"
-    cmd: set -o pipefail && cat "{{ output_dir | expanduser }}/authorized_keys" | fgrep DATA_BASIC
-    executable: /bin/bash
   changed_when: false
   register: content
 

tests/integration/targets/authorized_key/tasks/ssh_dss.yml

@@ -240,9 +240,7 @@
       - result.key_options == "no-agent-forwarding,no-X11-forwarding,permitopen=\"10.9.8.1:8080\",permitopen=\"10.9.8.1:9001\""
 
 - name: Get the file content
-  ansible.builtin.shell:
+  ansible.builtin.command: fgrep DATA_BASIC "{{ output_dir | expanduser }}/authorized_keys"
-    cmd: set -o pipefail && cat "{{ output_dir | expanduser }}/authorized_keys" | fgrep DATA_BASIC
-    executable: /bin/bash
   changed_when: false
   register: content
 

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

@@ -1,8 +1,24 @@
-- name: Install dependencies
+- name: Linux dependencies
-  ansible.builtin.package:
-    name: e2fsprogs
-    state: present
   when: ansible_system == 'Linux'
+  block:
+    - name: Install dependencies (Linux)
+      ansible.builtin.package:
+        name: e2fsprogs
+        state: present
+    - name: Set shell_executable fact (Linux)
+      ansible.builtin.set_fact:
+        shell_executable: /bin/bash
+
+- name: FreeBSD dependencies
+  when: ansible_system == 'FreeBSD'
+  block:
+    - name: Install dependencies (FreeBSD)
+      ansible.builtin.package:
+        name: bash
+        state: present
+    - name: Set shell_executable fact (FreeBSD)
+      ansible.builtin.set_fact:
+        shell_executable: /usr/local/bin/bash
 
 - name: Create the mount point
   ansible.builtin.file:
@@ -106,7 +122,7 @@
 - name: Get mount options
   ansible.builtin.shell:
     cmd: set -o pipefail && mount | grep mount_dest | grep -E -w '(ro|read-only)' | wc -l
-    executable: /bin/bash
+    executable: "{{ shell_executable }}"
   changed_when: false
   register: remount_options
 
@@ -279,7 +295,7 @@
       ansible.builtin.shell:
         cmd: >-
           set -o pipefail && dumpe2fs /tmp/myfs.img 2>/dev/null | grep -i "last write time:" | cut -d: -f2-
-        executable: /bin/bash
+        executable: "{{ shell_executable }}"
       changed_when: false
       register: last_write_time
 
@@ -296,7 +312,7 @@
       ansible.builtin.shell:
         cmd: >-
           set -o pipefail && dumpe2fs /tmp/myfs.img 2>/dev/null | grep -i "last write time:" |cut -d: -f2-
-        executable: /bin/bash
+        executable: "{{ shell_executable }}"
       changed_when: false
       register: last_write_time2
 
@@ -314,7 +330,7 @@
     - name: Get remounted options (Linux only)
       ansible.builtin.shell:
         cmd: set -o pipefail && mount | grep myfs | grep -E -w 'noexec' | wc -l
-        executable: /bin/bash
+        executable: "{{ shell_executable }}"
       changed_when: false
       register: remounted_options
 
@@ -542,14 +558,14 @@
     - name: Create loop devices on Solaris and BSD
       ansible.builtin.shell:
         cmd: "set -o pipefail && {{ ephemeral_create_loop_dev_cmd }}"
-        executable: /bin/bash
+        executable: "{{ shell_executable }}"
       changed_when: true
       when: ephemeral_create_loop_dev_cmd is defined
 
     - name: Format FS A and B on Solaris and BSD
       ansible.builtin.shell:
         cmd: "set -o pipefail && {{ ephemeral_format_fs_cmd }}"
-        executable: /bin/bash
+        executable: "{{ shell_executable }}"
       changed_when: true
       when: ephemeral_format_fs_cmd is defined
 
@@ -702,7 +718,7 @@
     - name: Remove loop devices on Solaris and BSD
       ansible.builtin.shell:
         cmd: "set -o pipefail && {{ ephemeral_remove_loop_dev_cmd }}"
-        executable: /bin/bash
+        executable: "{{ shell_executable }}"
       changed_when: true
       when: ephemeral_remove_loop_dev_cmd is defined