[PR #7807/ee8b1570 backport][stable-7] Fix failing sanity and integration tests (#7808)

Fix failing sanity and integration tests (#7807)

* Remove some Shippable specific code that trips latest shellcheck.

* Rename templated shell script to .sh.j2 to avoid shellcheck disliking the templating.

* Copy on the remote, not from controller to remote.

(cherry picked from commit ee8b15708f)

Co-authored-by: Felix Fontein <felix@fontein.de>

tests/integration/targets/cmd_runner/tasks/test_cmd_echo.yml

@@ -7,7 +7,8 @@
   ansible.builtin.copy:
     src: /bin/echo
     dest: "{{ item.copy_to }}/echo"
-    mode: "755"
+    mode: "0755"
+    remote_src: true
   when: item.copy_to is defined
 
 - name: test cmd_echo module ({{ item.name }})

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

@@ -45,7 +45,7 @@
 
 - name: Copy templated helper script
   template:
-    src: obtainpid.sh
+    src: obtainpid.sh.j2
     dest: "{{ remote_tmp_dir }}/obtainpid.sh"
     mode: 0755
 

tests/utils/shippable/shippable.sh

@@ -65,16 +65,7 @@ else
     retry pip install "https://github.com/ansible/ansible/archive/stable-${ansible_version}.tar.gz" --disable-pip-version-check
 fi
 
-if [ "${SHIPPABLE_BUILD_ID:-}" ]; then
+export ANSIBLE_COLLECTIONS_PATHS="${PWD}/../../../"
-    export ANSIBLE_COLLECTIONS_PATHS="${HOME}/.ansible"
-    SHIPPABLE_RESULT_DIR="$(pwd)/shippable"
-    TEST_DIR="${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/community/general"
-    mkdir -p "${TEST_DIR}"
-    cp -aT "${SHIPPABLE_BUILD_DIR}" "${TEST_DIR}"
-    cd "${TEST_DIR}"
-else
-    export ANSIBLE_COLLECTIONS_PATHS="${PWD}/../../../"
-fi
 
 if [ "${test}" == "sanity/extra" ]; then
     retry pip install junit-xml --disable-pip-version-check