From d5e321552a1b722b139ae20694391ff4ca9b7470 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Fri, 9 Dec 2022 13:13:56 +0100
Subject: [PATCH] Update CI scripts to be more close to the ones in
 ansible-core.

---
 tests/utils/shippable/alpine.sh |  1 +
 tests/utils/shippable/fedora.sh |  1 +
 tests/utils/shippable/remote.sh | 12 +++++++++++-
 tests/utils/shippable/ubuntu.sh |  1 +
 4 files changed, 14 insertions(+), 1 deletion(-)
 create mode 120000 tests/utils/shippable/alpine.sh
 create mode 120000 tests/utils/shippable/fedora.sh
 create mode 120000 tests/utils/shippable/ubuntu.sh

diff --git a/tests/utils/shippable/alpine.sh b/tests/utils/shippable/alpine.sh
new file mode 120000
index 00000000..6ddb7768
--- /dev/null
+++ b/tests/utils/shippable/alpine.sh
@@ -0,0 +1 @@
+remote.sh
\ No newline at end of file
diff --git a/tests/utils/shippable/fedora.sh b/tests/utils/shippable/fedora.sh
new file mode 120000
index 00000000..6ddb7768
--- /dev/null
+++ b/tests/utils/shippable/fedora.sh
@@ -0,0 +1 @@
+remote.sh
\ No newline at end of file
diff --git a/tests/utils/shippable/remote.sh b/tests/utils/shippable/remote.sh
index 43fbb444..b70adf78 100755
--- a/tests/utils/shippable/remote.sh
+++ b/tests/utils/shippable/remote.sh
@@ -10,6 +10,16 @@ IFS='/:' read -ra args <<< "$1"
 
 platform="${args[0]}"
 version="${args[1]}"
+pyver=default
+
+# check for explicit python version like 8.3@3.8
+declare -a splitversion
+IFS='@' read -ra splitversion <<< "$version"
+
+if [ "${#splitversion[@]}" -gt 1 ]; then
+    version="${splitversion[0]}"
+    pyver="${splitversion[1]}"
+fi
 
 if [ "${#args[@]}" -gt 2 ]; then
     target="azp/posix/${args[2]}/"
@@ -22,4 +32,4 @@ provider="${P:-default}"
 
 # shellcheck disable=SC2086
 ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \
-    --remote "${platform}/${version}" --remote-terminate always --remote-stage "${stage}" --remote-provider "${provider}"
+    --python "${pyver}" --remote "${platform}/${version}" --remote-terminate always --remote-stage "${stage}" --remote-provider "${provider}"
diff --git a/tests/utils/shippable/ubuntu.sh b/tests/utils/shippable/ubuntu.sh
new file mode 120000
index 00000000..6ddb7768
--- /dev/null
+++ b/tests/utils/shippable/ubuntu.sh
@@ -0,0 +1 @@
+remote.sh
\ No newline at end of file