From 2bda93a682d9ee9e9a327a18d16642c2dbf74c27 Mon Sep 17 00:00:00 2001 From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com> Date: Sat, 21 May 2022 19:33:30 +0200 Subject: [PATCH] CI: Replace the container used in the nsenter tests (#368) (#369) * Replace the container used in the nsenter tests. * Improve connection tests.g * Use quay.io/ansible/ansible-runner:devel instead. (cherry picked from commit ab2d33aa99f4f5ed3a8a1f7b1d4ed048c404b5d5) Co-authored-by: Felix Fontein --- tests/integration/targets/connection_nsenter/runme.sh | 2 +- tests/integration/targets/connection_posix/test.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/integration/targets/connection_nsenter/runme.sh b/tests/integration/targets/connection_nsenter/runme.sh index e2f19542..6f8ec2d3 100755 --- a/tests/integration/targets/connection_nsenter/runme.sh +++ b/tests/integration/targets/connection_nsenter/runme.sh @@ -4,7 +4,7 @@ set -euo pipefail [[ -n "${DEBUG:-}" || -n "${ANSIBLE_DEBUG:-}" ]] && set -x -readonly IMAGE="quay.io/ansible/toolset:latest" +readonly IMAGE="quay.io/ansible/ansible-runner:devel" readonly PYTHON="$(command -v python3 python | head -n1)" # Determine collection root diff --git a/tests/integration/targets/connection_posix/test.sh b/tests/integration/targets/connection_posix/test.sh index d3976ff3..96eaa85f 100755 --- a/tests/integration/targets/connection_posix/test.sh +++ b/tests/integration/targets/connection_posix/test.sh @@ -5,7 +5,9 @@ set -eux # Connection tests for POSIX platforms use this script by linking to it from the appropriate 'connection_' target dir. # The name of the inventory group to test is extracted from the directory name following the 'connection_' prefix. -group=$(python -c \ +PYTHON="$(command -v python3 python | head -n1)" + +group=$(${PYTHON} -c \ "from os import path; print(path.basename(path.abspath(path.dirname('$0'))).replace('connection_', ''))") cd ../connection