diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index f297c1f..cc4a6ae 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -109,10 +109,10 @@ stages: targets: - name: Fedora 40 test: fedora40 + - name: Ubuntu 22.04 + test: ubuntu2204 - name: Ubuntu 24.04 test: ubuntu2404 - - name: Ubuntu 22.04 - test: ubuntu2204@default - stage: Docker_2_17 displayName: Docker 2.17 dependsOn: [] @@ -172,8 +172,8 @@ stages: parameters: testFormat: devel/{0}/1 targets: - - name: RHEL 9.3 py39 - test: rhel/9.3@3.9 + - name: RHEL 9.4 + test: rhel/9.4 - name: FreeBSD 13.3 test: freebsd/13.3 - stage: Remote_2_17 diff --git a/tests/utils/shippable/linux.sh b/tests/utils/shippable/linux.sh index 799e2a2..9cc2f96 100755 --- a/tests/utils/shippable/linux.sh +++ b/tests/utils/shippable/linux.sh @@ -6,15 +6,6 @@ declare -a args IFS='/:' read -ra args <<< "$1" image="${args[1]}" -pyver=default -# check for explicit python version like 8.3@3.8 -declare -a splitversion -IFS='@' read -ra splitversion <<< "$image" - -if [ "${#splitversion[@]}" -gt 1 ]; then - image="${splitversion[0]}" - pyver="${splitversion[1]}" -fi if [ "${#args[@]}" -gt 2 ]; then target="shippable/posix/group${args[2]}/" @@ -24,4 +15,4 @@ fi # shellcheck disable=SC2086 ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \ - --docker "${image}" --python "${pyver}" + --docker "${image}" diff --git a/tests/utils/shippable/remote.sh b/tests/utils/shippable/remote.sh index a80b1a3..cd3014c 100755 --- a/tests/utils/shippable/remote.sh +++ b/tests/utils/shippable/remote.sh @@ -7,16 +7,6 @@ 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]}/" @@ -29,4 +19,4 @@ provider="${P:-default}" # shellcheck disable=SC2086 ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \ - --python "${pyver}" --remote "${platform}/${version}" --remote-terminate always --remote-stage "${stage}" --remote-provider "${provider}" + --remote "${platform}/${version}" --remote-terminate always --remote-stage "${stage}" --remote-provider "${provider}"