From 3bff8d22a5081a4614cb3c0132cabb9bd29bb804 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Fri, 12 Jul 2024 14:43:14 -0700 Subject: [PATCH 01/14] 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 02/14] 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 03/14] 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 04/14] 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 05/14] 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}" From 271119d196bfc0964daf1cb3b92a737e0426d3b6 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Fri, 12 Jul 2024 16:24:56 -0700 Subject: [PATCH 06/14] Update Ubuntu 2204 Signed-off-by: Abhijeet Kasurde --- .azure-pipelines/azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 5c6287b..c73c3d4 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -109,8 +109,8 @@ stages: targets: - name: Fedora 39 py311 test: fedora39@3.11 - - name: Ubuntu 20.04 py39 - test: ubuntu2004@3.9 + - name: Ubuntu 20.04 py310 + test: ubuntu2004@3.10 - name: Ubuntu 22.04 py39 test: ubuntu2204@3.9 - stage: Docker_2_17 From d80fde7ea04bb4ff58ede8f396bf1dee580ffa8b Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Fri, 12 Jul 2024 16:26:41 -0700 Subject: [PATCH 07/14] Update Ubuntu 2004 Signed-off-by: Abhijeet Kasurde --- .azure-pipelines/azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index c73c3d4..5ed6235 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 py311 - test: fedora39@3.11 + - name: Fedora 39 + test: fedora39@default - name: Ubuntu 20.04 py310 test: ubuntu2004@3.10 - - name: Ubuntu 22.04 py39 - test: ubuntu2204@3.9 + - name: Ubuntu 22.04 + test: ubuntu2204@default - stage: Docker_2_17 displayName: Docker 2.17 dependsOn: [] From 39a9e79985fc239e8ac8212f3aa88ad35df846da Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Fri, 12 Jul 2024 16:31:01 -0700 Subject: [PATCH 08/14] Update Ubuntu 2004 Signed-off-by: Abhijeet Kasurde --- .azure-pipelines/azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 5ed6235..995b7a6 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -107,8 +107,8 @@ stages: parameters: testFormat: devel/linux/{0}/1 targets: - - name: Fedora 39 - test: fedora39@default + - name: Fedora 39 py310 + test: fedora39@3.10 - name: Ubuntu 20.04 py310 test: ubuntu2004@3.10 - name: Ubuntu 22.04 From c29e8c213bdc5b209f3fe94150d9a26f9f1190d2 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Sat, 13 Jul 2024 08:23:29 -0700 Subject: [PATCH 09/14] Update Fedora 40 Signed-off-by: Abhijeet Kasurde --- .azure-pipelines/azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 995b7a6..d68205e 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -107,8 +107,8 @@ stages: parameters: testFormat: devel/linux/{0}/1 targets: - - name: Fedora 39 py310 - test: fedora39@3.10 + - name: Fedora 40 + test: fedora40 - name: Ubuntu 20.04 py310 test: ubuntu2004@3.10 - name: Ubuntu 22.04 From 7b9eb8d56e08fd8d12fb38c4bce8c2d170827261 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Sat, 13 Jul 2024 08:35:59 -0700 Subject: [PATCH 10/14] Update Ubuntu 2004 Signed-off-by: Abhijeet Kasurde --- .azure-pipelines/azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index d68205e..b30e930 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -109,8 +109,8 @@ stages: targets: - name: Fedora 40 test: fedora40 - - name: Ubuntu 20.04 py310 - test: ubuntu2004@3.10 + - name: Ubuntu 20.04 + test: ubuntu2004 - name: Ubuntu 22.04 test: ubuntu2204@default - stage: Docker_2_17 From 7bf56953cbd3cfa5b50201f44d7c0ee4fc86a173 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Sat, 13 Jul 2024 08:52:46 -0700 Subject: [PATCH 11/14] Update Ubuntu 2004 Signed-off-by: Abhijeet Kasurde --- .azure-pipelines/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index b30e930..98101d8 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -110,7 +110,7 @@ stages: - name: Fedora 40 test: fedora40 - name: Ubuntu 20.04 - test: ubuntu2004 + test: ubuntu2004@default - name: Ubuntu 22.04 test: ubuntu2204@default - stage: Docker_2_17 From c07ebc2f9c2f8b71124698fc7e29a13406772c54 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Mon, 15 Jul 2024 09:40:13 -0700 Subject: [PATCH 12/14] Update Ubuntu 2404 Signed-off-by: Abhijeet Kasurde --- .azure-pipelines/azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 98101d8..f297c1f 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -109,8 +109,8 @@ stages: targets: - name: Fedora 40 test: fedora40 - - name: Ubuntu 20.04 - test: ubuntu2004@default + - name: Ubuntu 24.04 + test: ubuntu2404 - name: Ubuntu 22.04 test: ubuntu2204@default - stage: Docker_2_17 From 738a839ce5e1f340bcdc99c19deadb3804ebb1a9 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Mon, 15 Jul 2024 10:22:43 -0700 Subject: [PATCH 13/14] Remove unecessary changes to CI scripts --- .azure-pipelines/azure-pipelines.yml | 8 ++++---- tests/utils/shippable/linux.sh | 11 +---------- tests/utils/shippable/remote.sh | 12 +----------- 3 files changed, 6 insertions(+), 25 deletions(-) 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}" From 41fc0901d9db406df69f707235d8e3a5bd330753 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Mon, 15 Jul 2024 10:25:20 -0700 Subject: [PATCH 14/14] Remove unecessary changes to CI scripts --- .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 d6a4d5a..5250ed8 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(replace(job.test, '/', '_'), '.', '_'), '-', '_'), '@', '_') }} + - job: test_${{ replace(replace(replace(job.test, '/', '_'), '.', '_'), '-', '_') }} displayName: ${{ job.name }} container: default workspace: