From 55fb80cf5e55fec5134d01f3bf30d4fc0a4638f1 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Fri, 12 Jul 2024 15:16:36 -0700 Subject: [PATCH] CI fixes Signed-off-by: Abhijeet Kasurde --- .azure-pipelines/azure-pipelines.yml | 6 ++++-- tests/utils/shippable/remote.sh | 12 +++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 27d28a1..88c124d 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -172,8 +172,10 @@ stages: parameters: testFormat: devel/{0}/1 targets: - - name: RHEL 9.3 - test: rhel/9.3 + - name: RHEL 9.3 py39 + test: rhel/9.3@3.9 + - name: RHEL 9.3 py311 + test: rhel/9.3@3.11 - name: FreeBSD 13.3 test: freebsd/13.3 - stage: Remote_2_17 diff --git a/tests/utils/shippable/remote.sh b/tests/utils/shippable/remote.sh index cd3014c..a80b1a3 100755 --- a/tests/utils/shippable/remote.sh +++ b/tests/utils/shippable/remote.sh @@ -7,6 +7,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="shippable/posix/group${args[2]}/" @@ -19,4 +29,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}"