From 3bff8d22a5081a4614cb3c0132cabb9bd29bb804 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Fri, 12 Jul 2024 14:43:14 -0700 Subject: [PATCH 1/5] Update CI pipelines Signed-off-by: Abhijeet Kasurde --- .azure-pipelines/azure-pipelines.yml | 48 ---------------------------- 1 file changed, 48 deletions(-) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 0169be1..27d28a1 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -98,19 +98,6 @@ stages: test: sanity - name: Units test: units - - stage: Sanity_2_14 - displayName: Ansible 2.14 sanity - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - nameFormat: "{0}" - testFormat: 2.14/{0} - targets: - - name: Sanity - test: sanity - - name: Units - test: units ## Docker - stage: Docker_devel displayName: Docker devel @@ -175,24 +162,6 @@ stages: test: ubuntu2004 - name: Ubuntu 22.04 test: ubuntu2204 - - stage: Docker_2_14 - displayName: Docker 2.14 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.14/linux/{0}/1 - targets: - - name: CentOS 7 - test: centos7 - - name: Fedora 36 - test: fedora36 - - name: openSUSE 15 py3 - test: opensuse15 - - name: Ubuntu 20.04 - test: ubuntu2004 - - name: Ubuntu 22.04 - test: ubuntu2204 ## Remote - stage: Remote_devel @@ -250,29 +219,12 @@ stages: test: rhel/9.1 - name: FreeBSD 13.2 test: freebsd/13.2 - - stage: Remote_2_14 - displayName: Remote 2.14 - dependsOn: [] - jobs: - - template: templates/matrix.yml - parameters: - testFormat: 2.14/{0}/1 - targets: - - name: RHEL 7.9 - test: rhel/7.9 - - name: RHEL 8.6 - test: rhel/8.6 - - name: FreeBSD 13.2 - test: freebsd/13.2 ## Finally - stage: Summary condition: succeededOrFailed() dependsOn: - - Sanity_2_14 - - Remote_2_14 - - Docker_2_14 - Sanity_2_15 - Remote_2_15 - Docker_2_15 From 55fb80cf5e55fec5134d01f3bf30d4fc0a4638f1 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Fri, 12 Jul 2024 15:16:36 -0700 Subject: [PATCH 2/5] 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}" From d2f1cc063adadd1db99c9bb2951b00d83c894e40 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Fri, 12 Jul 2024 15:27:56 -0700 Subject: [PATCH 3/5] CI fixes Signed-off-by: Abhijeet Kasurde --- .azure-pipelines/templates/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/templates/test.yml b/.azure-pipelines/templates/test.yml index 5250ed8..d6a4d5a 100644 --- a/.azure-pipelines/templates/test.yml +++ b/.azure-pipelines/templates/test.yml @@ -9,7 +9,7 @@ parameters: jobs: - ${{ each job in parameters.jobs }}: - - job: test_${{ replace(replace(replace(job.test, '/', '_'), '.', '_'), '-', '_') }} + - job: test_${{ replace(replace(replace(replace(job.test, '/', '_'), '.', '_'), '-', '_'), '@', '_') }} displayName: ${{ job.name }} container: default workspace: From 0ea18d208f1e3e3e27cc7b000bed6ef0a0282ac2 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Fri, 12 Jul 2024 15:58:43 -0700 Subject: [PATCH 4/5] remove RHEL9.3@3.11 Signed-off-by: Abhijeet Kasurde --- .azure-pipelines/azure-pipelines.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 88c124d..e1ad85f 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -174,8 +174,6 @@ stages: targets: - 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 From af6b90981af6daa1a73e29fc5c2c4764cff6f480 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Fri, 12 Jul 2024 16:06:40 -0700 Subject: [PATCH 5/5] Add Python version for Ubuntu and Fedora Signed-off-by: Abhijeet Kasurde --- .azure-pipelines/azure-pipelines.yml | 12 ++++++------ tests/utils/shippable/linux.sh | 11 ++++++++++- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index e1ad85f..5c6287b 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -107,12 +107,12 @@ stages: parameters: testFormat: devel/linux/{0}/1 targets: - - name: Fedora 39 - test: fedora39 - - name: Ubuntu 20.04 - test: ubuntu2004 - - name: Ubuntu 22.04 - test: ubuntu2204 + - name: Fedora 39 py311 + test: fedora39@3.11 + - name: Ubuntu 20.04 py39 + test: ubuntu2004@3.9 + - name: Ubuntu 22.04 py39 + test: ubuntu2204@3.9 - stage: Docker_2_17 displayName: Docker 2.17 dependsOn: [] diff --git a/tests/utils/shippable/linux.sh b/tests/utils/shippable/linux.sh index 9cc2f96..799e2a2 100755 --- a/tests/utils/shippable/linux.sh +++ b/tests/utils/shippable/linux.sh @@ -6,6 +6,15 @@ 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]}/" @@ -15,4 +24,4 @@ fi # shellcheck disable=SC2086 ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"} \ - --docker "${image}" + --docker "${image}" --python "${pyver}"