From 466cb7b8b7ca136d77340746712dbd5d94c925e7 Mon Sep 17 00:00:00 2001 From: Dan Childers Date: Thu, 25 Jun 2026 12:23:27 -0400 Subject: [PATCH] openstack-test: migrate CI config to OTE (openshift-tests-extension) Summary: - Mirroring combination of PRs: #80335 #80209 #79487 - Releases 4.14 - 4.22 - Original commit message and fix by @mandre Releases: Update the openstack-test main CI configuration to support the OTE migration in: openshift/openstack-test#266 (release-4.22) openshift/openstack-test#267 (release-4.21) openshift/openstack-test#268 (release-4.20) openshift/openstack-test#269 (release-4.19) openshift/openstack-test#271 (release-4.18) openshift/openstack-test#272 (release-4.17) openshift/openstack-test#273 (release-4.16) openshift/openstack-test#274 (release-4.15) openshift/openstack-test#275 (release-4.14) Changes: - binary_build_commands: build OTE extension binary via 'make tests-ext-build', package as tar.gz, and place at /usr/bin/ for payload discovery by openshift-tests - build test: verify the extension binary with --help instead of the removed openstack-tests binary - test/ccpmso jobs: use new openstack-test-openstack-ote step ref - dualstack jobs: override test phase with openshift-e2e-test + openstack-test-openstack-ote (replacing the old chain that used openstack-test-openstack) Dependencies: - step registry ref openstack-test-openstack-ote created in #79487 The old openstack-test-openstack step ref is preserved for older release branches that still use the standalone openstack-tests binary. --- .../openshift-openstack-test-release-4.14.yaml | 14 ++++++++++---- .../openshift-openstack-test-release-4.15.yaml | 17 +++++++++++++---- .../openshift-openstack-test-release-4.16.yaml | 17 +++++++++++++---- .../openshift-openstack-test-release-4.17.yaml | 17 +++++++++++++---- .../openshift-openstack-test-release-4.18.yaml | 17 +++++++++++++---- .../openshift-openstack-test-release-4.19.yaml | 17 +++++++++++++---- .../openshift-openstack-test-release-4.20.yaml | 17 +++++++++++++---- .../openshift-openstack-test-release-4.21.yaml | 17 +++++++++++++---- .../openshift-openstack-test-release-4.22.yaml | 17 +++++++++++++---- 9 files changed, 114 insertions(+), 36 deletions(-) diff --git a/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.14.yaml b/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.14.yaml index a886477bdecbe..041bb97cac324 100644 --- a/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.14.yaml +++ b/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.14.yaml @@ -1,4 +1,7 @@ -binary_build_commands: go build -o /bin/openstack-tests ./cmd/openshift-tests +binary_build_commands: | + go build -o /bin/openstack-tests ./cmd/openshift-tests && \ + make tests-ext-build && \ + gzip -c bin/openstack-test-tests-ext > /usr/bin/openstack-test-tests-ext.gz build_root: image_stream_tag: name: release @@ -30,7 +33,7 @@ resources: memory: 200Mi tests: - as: build - commands: openstack-tests --help + commands: ./bin/openstack-test-tests-ext --help container: from: bin - as: verify @@ -43,7 +46,7 @@ tests: env: CONFIG_TYPE: minimal test: - - ref: openstack-test-openstack + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-ipi - always_run: false as: e2e-openstack-ccpmso @@ -62,7 +65,7 @@ tests: resources: requests: cpu: 100m - - ref: openstack-test-openstack + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-ipi - always_run: false as: e2e-openstack-dualstack-techpreview @@ -71,6 +74,9 @@ tests: cluster_profile: openstack-hwoffload env: FEATURE_SET: TechPreviewNoUpgrade + test: + - ref: openshift-e2e-test + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-dualstack zz_generated_metadata: branch: release-4.14 diff --git a/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.15.yaml b/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.15.yaml index 062445eed166e..482352976a697 100644 --- a/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.15.yaml +++ b/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.15.yaml @@ -1,4 +1,7 @@ -binary_build_commands: go build -o /bin/openstack-tests ./cmd/openshift-tests +binary_build_commands: | + go build -o /bin/openstack-tests ./cmd/openshift-tests && \ + make tests-ext-build && \ + gzip -c bin/openstack-test-tests-ext > /usr/bin/openstack-test-tests-ext.gz build_root: image_stream_tag: name: release @@ -30,7 +33,7 @@ resources: memory: 200Mi tests: - as: build - commands: openstack-tests --help + commands: ./bin/openstack-test-tests-ext --help container: from: bin - as: verify @@ -43,7 +46,7 @@ tests: env: CONFIG_TYPE: minimal test: - - ref: openstack-test-openstack + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-ipi - always_run: false as: e2e-openstack-ccpmso @@ -62,13 +65,16 @@ tests: resources: requests: cpu: 100m - - ref: openstack-test-openstack + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-ipi - always_run: false as: e2e-openstack-dualstack optional: true steps: cluster_profile: openstack-hwoffload + test: + - ref: openshift-e2e-test + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-dualstack - always_run: false as: e2e-openstack-dualstack-v6primary @@ -77,6 +83,9 @@ tests: cluster_profile: openstack-hwoffload env: CONFIG_TYPE: dualstack-v6primary + test: + - ref: openshift-e2e-test + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-dualstack zz_generated_metadata: branch: release-4.15 diff --git a/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.16.yaml b/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.16.yaml index 6fef8feb88b8a..9ff149f143a66 100644 --- a/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.16.yaml +++ b/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.16.yaml @@ -1,4 +1,7 @@ -binary_build_commands: go build -o /bin/openstack-tests ./cmd/openshift-tests +binary_build_commands: | + go build -o /bin/openstack-tests ./cmd/openshift-tests && \ + make tests-ext-build && \ + gzip -c bin/openstack-test-tests-ext > /usr/bin/openstack-test-tests-ext.gz build_root: from_repository: true use_build_cache: true @@ -28,7 +31,7 @@ resources: memory: 200Mi tests: - as: build - commands: openstack-tests --help + commands: ./bin/openstack-test-tests-ext --help container: from: bin - as: verify @@ -41,7 +44,7 @@ tests: env: CONFIG_TYPE: minimal test: - - ref: openstack-test-openstack + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-ipi - always_run: false as: e2e-openstack-ccpmso @@ -60,13 +63,16 @@ tests: resources: requests: cpu: 100m - - ref: openstack-test-openstack + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-ipi - always_run: false as: e2e-openstack-dualstack optional: true steps: cluster_profile: openstack-hwoffload + test: + - ref: openshift-e2e-test + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-dualstack - always_run: false as: e2e-openstack-dualstack-v6primary @@ -75,6 +81,9 @@ tests: cluster_profile: openstack-hwoffload env: CONFIG_TYPE: dualstack-v6primary + test: + - ref: openshift-e2e-test + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-dualstack zz_generated_metadata: branch: release-4.16 diff --git a/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.17.yaml b/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.17.yaml index bf72b13b95e42..71d436e1d1954 100644 --- a/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.17.yaml +++ b/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.17.yaml @@ -1,4 +1,7 @@ -binary_build_commands: go build -o /bin/openstack-tests ./cmd/openshift-tests +binary_build_commands: | + go build -o /bin/openstack-tests ./cmd/openshift-tests && \ + make tests-ext-build && \ + gzip -c bin/openstack-test-tests-ext > /usr/bin/openstack-test-tests-ext.gz build_root: from_repository: true use_build_cache: true @@ -28,7 +31,7 @@ resources: memory: 200Mi tests: - as: build - commands: openstack-tests --help + commands: ./bin/openstack-test-tests-ext --help container: from: bin - as: verify @@ -41,7 +44,7 @@ tests: env: CONFIG_TYPE: minimal test: - - ref: openstack-test-openstack + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-ipi - always_run: false as: e2e-openstack-ccpmso @@ -60,13 +63,16 @@ tests: resources: requests: cpu: 100m - - ref: openstack-test-openstack + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-ipi - always_run: false as: e2e-openstack-dualstack optional: true steps: cluster_profile: openstack-hwoffload + test: + - ref: openshift-e2e-test + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-dualstack - always_run: false as: e2e-openstack-dualstack-v6primary @@ -75,6 +81,9 @@ tests: cluster_profile: openstack-hwoffload env: CONFIG_TYPE: dualstack-v6primary + test: + - ref: openshift-e2e-test + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-dualstack zz_generated_metadata: branch: release-4.17 diff --git a/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.18.yaml b/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.18.yaml index 88ad4284a63fc..8438b92f329c6 100644 --- a/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.18.yaml +++ b/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.18.yaml @@ -1,4 +1,7 @@ -binary_build_commands: go build -o /bin/openstack-tests ./cmd/openshift-tests +binary_build_commands: | + go build -o /bin/openstack-tests ./cmd/openshift-tests && \ + make tests-ext-build && \ + gzip -c bin/openstack-test-tests-ext > /usr/bin/openstack-test-tests-ext.gz build_root: from_repository: true use_build_cache: true @@ -28,7 +31,7 @@ resources: memory: 200Mi tests: - as: build - commands: openstack-tests --help + commands: ./bin/openstack-test-tests-ext --help container: from: bin - as: verify @@ -41,7 +44,7 @@ tests: env: CONFIG_TYPE: minimal test: - - ref: openstack-test-openstack + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-ipi - always_run: false as: e2e-openstack-ccpmso @@ -60,13 +63,16 @@ tests: resources: requests: cpu: 100m - - ref: openstack-test-openstack + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-ipi - always_run: false as: e2e-openstack-dualstack optional: true steps: cluster_profile: openstack-hwoffload + test: + - ref: openshift-e2e-test + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-dualstack - always_run: false as: e2e-openstack-dualstack-v6primary @@ -75,6 +81,9 @@ tests: cluster_profile: openstack-hwoffload env: CONFIG_TYPE: dualstack-v6primary + test: + - ref: openshift-e2e-test + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-dualstack zz_generated_metadata: branch: release-4.18 diff --git a/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.19.yaml b/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.19.yaml index 166b9e11b071d..fb9be0f2bb9a5 100644 --- a/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.19.yaml +++ b/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.19.yaml @@ -1,4 +1,7 @@ -binary_build_commands: go build -o /bin/openstack-tests ./cmd/openshift-tests +binary_build_commands: | + go build -o /bin/openstack-tests ./cmd/openshift-tests && \ + make tests-ext-build && \ + gzip -c bin/openstack-test-tests-ext > /usr/bin/openstack-test-tests-ext.gz build_root: from_repository: true use_build_cache: true @@ -28,7 +31,7 @@ resources: memory: 200Mi tests: - as: build - commands: openstack-tests --help + commands: ./bin/openstack-test-tests-ext --help container: from: bin - as: verify @@ -41,7 +44,7 @@ tests: env: CONFIG_TYPE: minimal test: - - ref: openstack-test-openstack + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-ipi - always_run: false as: e2e-openstack-ccpmso @@ -61,13 +64,16 @@ tests: requests: cpu: 100m timeout: 7h0m0s - - ref: openstack-test-openstack + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-ipi - always_run: false as: e2e-openstack-dualstack optional: true steps: cluster_profile: openstack-hwoffload + test: + - ref: openshift-e2e-test + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-dualstack - always_run: false as: e2e-openstack-dualstack-v6primary @@ -76,6 +82,9 @@ tests: cluster_profile: openstack-hwoffload env: CONFIG_TYPE: dualstack-v6primary + test: + - ref: openshift-e2e-test + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-dualstack zz_generated_metadata: branch: release-4.19 diff --git a/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.20.yaml b/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.20.yaml index 59397e7626800..b94cf0e8078a2 100644 --- a/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.20.yaml +++ b/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.20.yaml @@ -1,4 +1,7 @@ -binary_build_commands: go build -o /bin/openstack-tests ./cmd/openshift-tests +binary_build_commands: | + go build -o /bin/openstack-tests ./cmd/openshift-tests && \ + make tests-ext-build && \ + gzip -c bin/openstack-test-tests-ext > /usr/bin/openstack-test-tests-ext.gz build_root: from_repository: true use_build_cache: true @@ -28,7 +31,7 @@ resources: memory: 200Mi tests: - as: build - commands: openstack-tests --help + commands: ./bin/openstack-test-tests-ext --help container: from: bin - as: verify @@ -41,7 +44,7 @@ tests: env: CONFIG_TYPE: minimal test: - - ref: openstack-test-openstack + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-ipi - always_run: false as: e2e-openstack-ccpmso @@ -61,13 +64,16 @@ tests: requests: cpu: 100m timeout: 7h0m0s - - ref: openstack-test-openstack + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-ipi - always_run: false as: e2e-openstack-dualstack optional: true steps: cluster_profile: openstack-hwoffload + test: + - ref: openshift-e2e-test + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-dualstack - always_run: false as: e2e-openstack-dualstack-v6primary @@ -76,6 +82,9 @@ tests: cluster_profile: openstack-hwoffload env: CONFIG_TYPE: dualstack-v6primary + test: + - ref: openshift-e2e-test + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-dualstack zz_generated_metadata: branch: release-4.20 diff --git a/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.21.yaml b/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.21.yaml index 99180d1884e6d..0a736562de0ef 100644 --- a/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.21.yaml +++ b/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.21.yaml @@ -1,4 +1,7 @@ -binary_build_commands: go build -o /bin/openstack-tests ./cmd/openshift-tests +binary_build_commands: | + go build -o /bin/openstack-tests ./cmd/openshift-tests && \ + make tests-ext-build && \ + gzip -c bin/openstack-test-tests-ext > /usr/bin/openstack-test-tests-ext.gz build_root: from_repository: true use_build_cache: true @@ -28,7 +31,7 @@ resources: memory: 200Mi tests: - as: build - commands: openstack-tests --help + commands: ./bin/openstack-test-tests-ext --help container: from: bin - as: verify @@ -41,7 +44,7 @@ tests: env: CONFIG_TYPE: minimal test: - - ref: openstack-test-openstack + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-ipi - always_run: false as: e2e-openstack-ccpmso @@ -61,13 +64,16 @@ tests: requests: cpu: 100m timeout: 7h0m0s - - ref: openstack-test-openstack + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-ipi - always_run: false as: e2e-openstack-dualstack optional: true steps: cluster_profile: openstack-hwoffload + test: + - ref: openshift-e2e-test + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-dualstack - always_run: false as: e2e-openstack-dualstack-v6primary @@ -76,6 +82,9 @@ tests: cluster_profile: openstack-hwoffload env: CONFIG_TYPE: dualstack-v6primary + test: + - ref: openshift-e2e-test + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-dualstack zz_generated_metadata: branch: release-4.21 diff --git a/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.22.yaml b/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.22.yaml index f1b645930e0d8..de0c63235d2a6 100644 --- a/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.22.yaml +++ b/ci-operator/config/openshift/openstack-test/openshift-openstack-test-release-4.22.yaml @@ -1,4 +1,7 @@ -binary_build_commands: go build -o /bin/openstack-tests ./cmd/openshift-tests +binary_build_commands: | + go build -o /bin/openstack-tests ./cmd/openshift-tests && \ + make tests-ext-build && \ + gzip -c bin/openstack-test-tests-ext > /usr/bin/openstack-test-tests-ext.gz build_root: from_repository: true use_build_cache: true @@ -28,7 +31,7 @@ resources: memory: 200Mi tests: - as: build - commands: openstack-tests --help + commands: ./bin/openstack-test-tests-ext --help container: from: bin - as: verify @@ -41,7 +44,7 @@ tests: env: CONFIG_TYPE: minimal test: - - ref: openstack-test-openstack + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-ipi - always_run: false as: e2e-openstack-ccpmso @@ -61,13 +64,16 @@ tests: requests: cpu: 100m timeout: 7h0m0s - - ref: openstack-test-openstack + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-ipi - always_run: false as: e2e-openstack-dualstack optional: true steps: cluster_profile: openstack-hwoffload + test: + - ref: openshift-e2e-test + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-dualstack - always_run: false as: e2e-openstack-dualstack-v6primary @@ -76,6 +82,9 @@ tests: cluster_profile: openstack-hwoffload env: CONFIG_TYPE: dualstack-v6primary + test: + - ref: openshift-e2e-test + - ref: openstack-test-openstack-ote workflow: openshift-e2e-openstack-dualstack zz_generated_metadata: branch: release-4.22