[release-4.22] USHIFT-6905: consolidate CI test scenarios to reduce VM count by agullon · Pull Request #6588 · openshift/microshift

agullon · 2026-04-27T10:02:35Z

This is a cherrypick from #6591

Summary

Consolidate CI test scenarios to reduce VM count without losing test coverage. Tests that ran in dedicated VMs are now piggy-backed onto VMs already provisioned for compatible environments.

The changes are symmetric across el9 and el10 for the y1/y2 upgrade paths and standalone scenarios. el10 has additional operations for the el98→el102 cross-major-version upgrade path which has no el9 equivalent.

Additionally, cleanupWorkload.sh is fixed to use set -eux (was set -ux) so that cleanup failures abort the scenario instead of silently continuing.

`test/scenarios-bootc/el9/releases/` (8 deleted, 4 renamed, 2 created, 1 modified → net -6 VMs)

Deleted (8):

el98-lrel@tlsv13-standard1.sh — TLS v1.3 + standard1 already covered by multi-config-standard1
el98-lrel@tlsv13-standard2.sh — TLS v1.3 enforcement is transport-layer; validated by multi-config-standard1 running standard1, so dedicated standard2+TLS v1.3 testing is redundant
el98-lrel@configuration.sh — configuration suite moved into dual-stack-configuration
el98-lrel@fips.sh — FIPS suite moved into ai-model-serving-online-fips
el96-y1@el98-lrel@standard1.sh — standard1 suite moved into el96-y1@lvms-standard1
el96-y1@el98-lrel@standard2.sh — standard2 suite moved into el96-y1@lvms-standard2
el96-y2@el98-lrel@standard1.sh — standard1 suite moved into el96-y2@lvms-standard1
el96-y2@el98-lrel@standard2.sh — standard2 suite moved into el96-y2@lvms-standard2

Renamed (4):

el98-lrel@dual-stack.sh → el98-lrel@dual-stack-configuration.sh — added suites/configuration/
el98-lrel@ai-model-serving-online.sh → el98-lrel@ai-model-serving-online-fips.sh — switched to fips image, added --fips to launch_vm, added suites/fips/
el96-y1@el98-lrel@lvms.sh → el96-y1@el98-lrel@lvms-standard1.sh — added --vm_disksize 30
el96-y2@el98-lrel@lvms.sh → el96-y2@el98-lrel@lvms-standard2.sh — removed ginkgo, added suites/standard2/ after LVMS cleanup

Created (2):

el96-y1@el98-lrel@lvms-standard2.sh — LVMS lifecycle + standard2 after upgrade (replaces deleted standard2)
el96-y2@el98-lrel@lvms-standard1.sh — LVMS lifecycle + ginkgo + standard1 after upgrade (replaces deleted standard1)

Modified (1):

el98-lrel@multi-config-standard1.sh — removed --exclude version and stale comment (now the only place running standard1 with TLS v1.3)

`test/scenarios-bootc/el10/releases/` (8 deleted, 5 renamed, 1 created, 3 modified → net -7 VMs)

Same as el9 for standalone and y1/y2 upgrade scenarios, plus additional changes for the el98→el102 cross-major-version upgrade path (no el9 equivalent).

Deleted (8):

el102-lrel@tlsv13-standard1.sh — TLS v1.3 + standard1 already covered by multi-config-standard1
el102-lrel@tlsv13-standard2.sh — TLS v1.3 enforcement is transport-layer; validated by multi-config-standard1 running standard1, so dedicated standard2+TLS v1.3 testing is redundant
el102-lrel@configuration.sh — configuration suite moved into dual-stack-configuration
el102-lrel@fips.sh — FIPS suite moved into ai-model-serving-online-fips
el96-y1@el102-lrel@standard1.sh — standard1 suite moved into upgrade LVMS scenarios
el96-y1@el102-lrel@standard2.sh — standard2 suite moved into upgrade LVMS scenarios
el96-y2@el102-lrel@standard1.sh — standard1 suite moved into el96-y2@lvms-standard1
el96-y2@el102-lrel@standard2.sh — standard2 suite moved into el96-y2@lvms-standard2

Renamed (4 + 1 el98→el102):

el102-lrel@dual-stack.sh → el102-lrel@dual-stack-configuration.sh — added suites/configuration/
el102-lrel@ai-model-serving-online.sh → el102-lrel@ai-model-serving-online-fips.sh — switched to fips image, added --fips to launch_vm, added suites/fips/
el96-y1@el102-lrel@lvms.sh → el96-y1@el102-lrel@lvms-standard1.sh — added --vm_disksize 30
el96-y2@el102-lrel@lvms.sh → el96-y2@el102-lrel@lvms-standard1.sh — added --vm_disksize 30
(el98→el102 only) el98-lrel@el102-lrel@lvms.sh → el96-y1@el102-lrel@lvms-standard2.sh — changed upgrade path from el98→el102 to el96-y1→el102, removed ginkgo, added standard2, added --vm_disksize 30 (el98 LVMS tests absorbed into modified el98-lrel@el102-lrel@standard1/2)

Created (1):

el96-y2@el102-lrel@lvms-standard2.sh — LVMS lifecycle + standard2 after upgrade

Modified (1 + 2 el98→el102):

el102-lrel@multi-config-standard1.sh — removed --exclude version and stale comment
(el98→el102 only) el98-lrel@el102-lrel@standard1.sh — expanded with LVMS lifecycle (create/check/upgrade/validate/cleanup) + --vm_disksize 30, absorbing old el98-lrel@el102-lrel@lvms.sh
(el98→el102 only) el98-lrel@el102-lrel@standard2.sh — expanded with LVMS lifecycle (create/check/upgrade/validate/cleanup) + --vm_disksize 30, absorbing old el98-lrel@el102-lrel@lvms.sh

`test/scenarios/releases/` (ostree) (7 deleted, 3 renamed, 2 created, 3 re-enabled → net -2 VMs)

Equivalent to el9 bootc changes (no FIPS or AI model serving scenarios in ostree).

Deleted (7):

el98-lrel@tlsv13-standard1.sh — TLS v1.3 + standard1 already covered by ginkgo-multi-config
el98-lrel@tlsv13-standard2.sh — TLS v1.3 enforcement is transport-layer; validated by ginkgo-multi-config running standard1, so dedicated standard2+TLS v1.3 testing is redundant
el98-lrel@configuration.sh — configuration suite moved into dual-stack-configuration
el96-yminus1@el98-lrel@standard1.sh — standard1 suite moved into yminus1@lvms-standard1
el96-yminus1@el98-lrel@standard2.sh — standard2 suite moved into yminus1@lvms-standard2
el96-yminus2@el98-lrel@standard1.sh — standard1 suite moved into yminus2@lvms-standard1
el96-yminus2@el98-lrel@standard2.sh — standard2 suite moved into yminus2@lvms-standard2

Renamed (3):

el98-lrel@dual-stack.sh → el98-lrel@dual-stack-configuration.sh — added suites/configuration/
el96-yminus1@el98-lrel@lvms.sh → el96-yminus1@el98-lrel@lvms-standard1.sh — added --vm_disksize 30
el96-yminus2@el98-lrel@lvms.sh → el96-yminus2@el98-lrel@lvms-standard2.sh — removed ginkgo, added suites/standard2/ after LVMS cleanup, added --vm_disksize 30

Created (2):

el96-yminus1@el98-lrel@lvms-standard2.sh — LVMS lifecycle + standard2 after upgrade
el96-yminus2@el98-lrel@lvms-standard1.sh — LVMS lifecycle + ginkgo + standard1 after upgrade

Re-enabled (3):

el98@rpm-standard1.sh (was .disabled)
el98@rpm-standard2.sh (was .disabled)
el98@rpm-upgrade.sh (was .disabled)

`scripts/lvms-helpers/` (1 modified)

cleanupWorkload.sh — changed set -ux to set -eux so cleanup failures abort the scenario

Total: 23 scenarios deleted, 12 renamed, 5 created, 3 re-enabled, 1 script fixed → net -15 VMs

Test plan

Verify bootc el9 release scenarios discover and run all expected test suites
Verify bootc el10 release scenarios discover and run all expected test suites
Verify ostree release scenarios discover and run all expected test suites
Confirm no test suites were dropped (compare total test count before/after)

🤖 Generated with Claude Code

openshift-ci-robot · 2026-04-27T10:02:39Z

@agullon: This pull request explicitly references no jira issue.

Details

In response to this:

Summary

Merge standalone test scenarios (TLS v1.3, configuration, FIPS) into existing VMs that already provision compatible environments

Consolidate upgrade standard1/2 scenarios into LVMS upgrade scenarios, running standard suites after LVMS validation

Re-enable RPM scenarios (ostree)

Net effect: ~20 fewer CI VMs across bootc (el9/el10) and ostree, with no test coverage lost.

Test plan

Verify bootc el9 release scenarios discover and run all expected test suites

Verify bootc el10 release scenarios discover and run all expected test suites

Verify ostree release scenarios discover and run all expected test suites

Confirm no test suites were dropped (compare total test count before/after)

🤖 Generated with Claude Code

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

coderabbitai · 2026-04-27T10:02:45Z

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: a35986df-2376-4c43-a52a-ae2abccdce4f

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

agullon · 2026-04-27T10:11:56Z

/test e2e-aws-tests-release
/test e2e-aws-tests-release-arm
/test e2e-aws-tests-bootc-release-el9
/test e2e-aws-tests-bootc-release-el10
/test e2e-aws-tests-bootc-release-arm-el9
/test e2e-aws-tests-bootc-release-arm-el10

agullon · 2026-04-27T10:34:51Z

/test e2e-aws-tests-release
/test e2e-aws-tests-release-arm
/test e2e-aws-tests-bootc-release-el9
/test e2e-aws-tests-bootc-release-el10
/test e2e-aws-tests-bootc-release-arm-el9
/test e2e-aws-tests-bootc-release-arm-el10

TLS v1.3 enforcement is a transport-layer concern validated by multi-config-standard1 which already applies TLS v1.3 and runs standard1 tests. Dedicated TLS v1.3 scenarios for standard1/standard2 are redundant. Also remove --exclude version from multi-config-standard1 so that version tests now run there, and drop the stale comment that referenced the old exclusion. Removes 6 VMs (2 per platform: el9/el10 bootc, ostree). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> pre-commit.check-secrets: ENABLED

Piggyback the configuration test suite onto the dual-stack VM which is already provisioned with a compatible environment. The dual-stack scenario is renamed to dual-stack-configuration to reflect the combined coverage. Removes 3 VMs (1 per platform: el9/el10 bootc, ostree). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> pre-commit.check-secrets: ENABLED

Consolidate the FIPS test suite into the ai-model-serving-online VM by switching to the FIPS image, adding --fips to launch_vm for kernel-level FIPS enforcement, and appending suites/fips/ to the test run. Both scenarios already skip on aarch64. Removes 2 VMs (1 per platform: el9/el10 bootc; no ostree equivalent). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> pre-commit.check-secrets: ENABLED

Merge the standalone upgrade+standard1/standard2 scenarios into the LVMS upgrade scenarios. Each LVMS VM now runs the full LVMS lifecycle (create/check/upgrade/validate/cleanup) followed by a standard suite, eliminating the need for separate standard-only VMs. The split follows a consistent pattern across el9/el10 bootc and ostree: - lvms-standard1: LVMS lifecycle + ginkgo (y2 only) + standard1 with EXPECTED_OS_VERSION + --vm_disksize 30 - lvms-standard2: LVMS lifecycle + standard2 + --vm_disksize 30 For el10, the el98→el102 cross-major upgrade scenarios also absorb LVMS lifecycle testing with --vm_disksize 30. Removes 12 VMs (4 per platform: el9/el10 bootc, ostree) and absorbs the el10 el98→el102 LVMS scenario into the standard1/standard2 cross-major scenarios. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> pre-commit.check-secrets: ENABLED

Remove the .disabled suffix from el98 RPM standard1, standard2, and upgrade scenarios to restore their execution in CI. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> pre-commit.check-secrets: ENABLED

Change set -ux to set -eux so that cleanup failures (API server unreachable, RBAC errors, etc.) abort the scenario instead of silently exiting 0 and letting subsequent standard suite tests run on a degraded cluster. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> pre-commit.check-secrets: ENABLED

agullon · 2026-04-27T11:21:25Z

/test e2e-aws-tests-release
/test e2e-aws-tests-release-arm
/test e2e-aws-tests-bootc-release-el9
/test e2e-aws-tests-bootc-release-el10
/test e2e-aws-tests-bootc-release-arm-el9
/test e2e-aws-tests-bootc-release-arm-el10

The tuned image overwrites /etc/tuned/microshift-baseline-variables.conf with test-specific values, causing rpm -V --configfiles to fail in the version.robot RPM integrity check. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> pre-commit.check-secrets: ENABLED

agullon · 2026-04-27T13:43:42Z

/test e2e-aws-tests-release
/test e2e-aws-tests-release-arm
/test e2e-aws-tests-bootc-release-el9
/test e2e-aws-tests-bootc-release-el10
/test e2e-aws-tests-bootc-release-arm-el9
/test e2e-aws-tests-bootc-release-arm-el10

openshift-ci-robot · 2026-04-27T13:47:38Z

@agullon: This pull request references USHIFT-6905 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Summary

Consolidate CI test scenarios to reduce VM count without losing test coverage. Tests that ran in dedicated VMs are now piggy-backed onto VMs already provisioned for compatible environments.

The changes are symmetric across el9 and el10 for the y1/y2 upgrade paths and standalone scenarios. el10 has additional operations for the el98→el102 cross-major-version upgrade path which has no el9 equivalent.

Additionally, cleanupWorkload.sh is fixed to use set -eux (was set -ux) so that cleanup failures abort the scenario instead of silently continuing.

test/scenarios-bootc/el9/releases/ (8 deleted, 4 renamed, 2 created, 1 modified → net -6 VMs)

Deleted (8):

el98-lrel@tlsv13-standard1.sh — TLS v1.3 + standard1 already covered by multi-config-standard1

el98-lrel@tlsv13-standard2.sh — TLS v1.3 enforcement is transport-layer; validated by multi-config-standard1 running standard1, so dedicated standard2+TLS v1.3 testing is redundant

el98-lrel@configuration.sh — configuration suite moved into dual-stack-configuration

el98-lrel@fips.sh — FIPS suite moved into ai-model-serving-online-fips

el96-y1@el98-lrel@standard1.sh — standard1 suite moved into el96-y1@lvms-standard1

el96-y1@el98-lrel@standard2.sh — standard2 suite moved into el96-y1@lvms-standard2

el96-y2@el98-lrel@standard1.sh — standard1 suite moved into el96-y2@lvms-standard1

el96-y2@el98-lrel@standard2.sh — standard2 suite moved into el96-y2@lvms-standard2

Renamed (4):

el98-lrel@dual-stack.sh → el98-lrel@dual-stack-configuration.sh — added suites/configuration/

el98-lrel@ai-model-serving-online.sh → el98-lrel@ai-model-serving-online-fips.sh — switched to fips image, added --fips to launch_vm, added suites/fips/

el96-y1@el98-lrel@lvms.sh → el96-y1@el98-lrel@lvms-standard1.sh — added --vm_disksize 30

el96-y2@el98-lrel@lvms.sh → el96-y2@el98-lrel@lvms-standard2.sh — removed ginkgo, added suites/standard2/ after LVMS cleanup

Created (2):

el96-y1@el98-lrel@lvms-standard2.sh — LVMS lifecycle + standard2 after upgrade (replaces deleted standard2)

el96-y2@el98-lrel@lvms-standard1.sh — LVMS lifecycle + ginkgo + standard1 after upgrade (replaces deleted standard1)

Modified (1):

el98-lrel@multi-config-standard1.sh — removed --exclude version and stale comment (now the only place running standard1 with TLS v1.3)

test/scenarios-bootc/el10/releases/ (8 deleted, 5 renamed, 1 created, 3 modified → net -7 VMs)

Same as el9 for standalone and y1/y2 upgrade scenarios, plus additional changes for the el98→el102 cross-major-version upgrade path (no el9 equivalent).

Deleted (8):

el102-lrel@tlsv13-standard1.sh — TLS v1.3 + standard1 already covered by multi-config-standard1

el102-lrel@tlsv13-standard2.sh — TLS v1.3 enforcement is transport-layer; validated by multi-config-standard1 running standard1, so dedicated standard2+TLS v1.3 testing is redundant

el102-lrel@configuration.sh — configuration suite moved into dual-stack-configuration

el102-lrel@fips.sh — FIPS suite moved into ai-model-serving-online-fips

el96-y1@el102-lrel@standard1.sh — standard1 suite moved into upgrade LVMS scenarios

el96-y1@el102-lrel@standard2.sh — standard2 suite moved into upgrade LVMS scenarios

el96-y2@el102-lrel@standard1.sh — standard1 suite moved into el96-y2@lvms-standard1

el96-y2@el102-lrel@standard2.sh — standard2 suite moved into el96-y2@lvms-standard2

Renamed (4 + 1 el98→el102):

el102-lrel@dual-stack.sh → el102-lrel@dual-stack-configuration.sh — added suites/configuration/

el102-lrel@ai-model-serving-online.sh → el102-lrel@ai-model-serving-online-fips.sh — switched to fips image, added --fips to launch_vm, added suites/fips/

el96-y1@el102-lrel@lvms.sh → el96-y1@el102-lrel@lvms-standard1.sh — added --vm_disksize 30

el96-y2@el102-lrel@lvms.sh → el96-y2@el102-lrel@lvms-standard1.sh — added --vm_disksize 30

(el98→el102 only) el98-lrel@el102-lrel@lvms.sh → el96-y1@el102-lrel@lvms-standard2.sh — changed upgrade path from el98→el102 to el96-y1→el102, removed ginkgo, added standard2, added --vm_disksize 30 (el98 LVMS tests absorbed into modified el98-lrel@el102-lrel@standard1/2)

Created (1):

el96-y2@el102-lrel@lvms-standard2.sh — LVMS lifecycle + standard2 after upgrade

Modified (1 + 2 el98→el102):

el102-lrel@multi-config-standard1.sh — removed --exclude version and stale comment

(el98→el102 only) el98-lrel@el102-lrel@standard1.sh — expanded with LVMS lifecycle (create/check/upgrade/validate/cleanup) + --vm_disksize 30, absorbing old el98-lrel@el102-lrel@lvms.sh

(el98→el102 only) el98-lrel@el102-lrel@standard2.sh — expanded with LVMS lifecycle (create/check/upgrade/validate/cleanup) + --vm_disksize 30, absorbing old el98-lrel@el102-lrel@lvms.sh

test/scenarios/releases/ (ostree) (7 deleted, 3 renamed, 2 created, 3 re-enabled → net -2 VMs)

Equivalent to el9 bootc changes (no FIPS or AI model serving scenarios in ostree).

Deleted (7):

el98-lrel@tlsv13-standard1.sh — TLS v1.3 + standard1 already covered by ginkgo-multi-config

el98-lrel@tlsv13-standard2.sh — TLS v1.3 enforcement is transport-layer; validated by ginkgo-multi-config running standard1, so dedicated standard2+TLS v1.3 testing is redundant

el98-lrel@configuration.sh — configuration suite moved into dual-stack-configuration

el96-yminus1@el98-lrel@standard1.sh — standard1 suite moved into yminus1@lvms-standard1

el96-yminus1@el98-lrel@standard2.sh — standard2 suite moved into yminus1@lvms-standard2

el96-yminus2@el98-lrel@standard1.sh — standard1 suite moved into yminus2@lvms-standard1

el96-yminus2@el98-lrel@standard2.sh — standard2 suite moved into yminus2@lvms-standard2

Renamed (3):

el98-lrel@dual-stack.sh → el98-lrel@dual-stack-configuration.sh — added suites/configuration/

el96-yminus1@el98-lrel@lvms.sh → el96-yminus1@el98-lrel@lvms-standard1.sh — added --vm_disksize 30

el96-yminus2@el98-lrel@lvms.sh → el96-yminus2@el98-lrel@lvms-standard2.sh — removed ginkgo, added suites/standard2/ after LVMS cleanup, added --vm_disksize 30

Created (2):

el96-yminus1@el98-lrel@lvms-standard2.sh — LVMS lifecycle + standard2 after upgrade

el96-yminus2@el98-lrel@lvms-standard1.sh — LVMS lifecycle + ginkgo + standard1 after upgrade

Re-enabled (3):

el98@rpm-standard1.sh (was .disabled)

el98@rpm-standard2.sh (was .disabled)

el98@rpm-upgrade.sh (was .disabled)

scripts/lvms-helpers/ (1 modified)

cleanupWorkload.sh — changed set -ux to set -eux so cleanup failures abort the scenario

Total: 23 scenarios deleted, 12 renamed, 5 created, 3 re-enabled, 1 script fixed → net -15 VMs

Test plan

Verify bootc el9 release scenarios discover and run all expected test suites

Verify bootc el10 release scenarios discover and run all expected test suites

Verify ostree release scenarios discover and run all expected test suites

Confirm no test suites were dropped (compare total test count before/after)

🤖 Generated with Claude Code

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

agullon · 2026-04-27T14:41:01Z

/retest

agullon · 2026-04-28T21:11:42Z

/retest all

agullon · 2026-04-29T06:16:29Z

/test e2e-aws-tests-release
/test e2e-aws-tests-bootc-release-arm-el9

agullon · 2026-04-29T06:16:36Z

/test e2e-aws-tests-release
/test e2e-aws-tests-bootc-release-arm-el9

agullon · 2026-04-29T08:05:20Z

/test e2e-aws-tests-bootc-release-arm-el9

agullon · 2026-04-29T10:48:01Z

/override ci/prow/e2e-aws-tests-bootc-release-arm-el9
/override ci/prow/e2e-aws-tests-bootc-release-arm-el10
/override ci/prow/e2e-aws-tests-bootc-release-e10

because errors no related with this change

openshift-ci · 2026-04-29T10:48:24Z

@agullon: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

ci/prow/e2e-aws-tests-bootc-release-e10

Only the following failed contexts/checkruns were expected:

CodeRabbit
ci/prow/e2e-aws-tests
ci/prow/e2e-aws-tests-arm
ci/prow/e2e-aws-tests-bootc-arm-el10
ci/prow/e2e-aws-tests-bootc-arm-el9
ci/prow/e2e-aws-tests-bootc-el10
ci/prow/e2e-aws-tests-bootc-el9
ci/prow/e2e-aws-tests-bootc-release-arm-el10
ci/prow/e2e-aws-tests-bootc-release-arm-el9
ci/prow/e2e-aws-tests-bootc-release-el10
ci/prow/e2e-aws-tests-bootc-release-el9
ci/prow/e2e-aws-tests-release
ci/prow/e2e-aws-tests-release-arm
ci/prow/images
ci/prow/security
ci/prow/test-unit
ci/prow/verify
ci/prow/verify-deps
pull-ci-openshift-microshift-main-e2e-aws-tests
pull-ci-openshift-microshift-main-e2e-aws-tests-arm
pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-arm-el10
pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-arm-el9
pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-el10
pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-el9
pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-release-arm-el10
pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-release-arm-el9
pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-release-el10
pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-release-el9
pull-ci-openshift-microshift-main-e2e-aws-tests-release
pull-ci-openshift-microshift-main-e2e-aws-tests-release-arm
pull-ci-openshift-microshift-main-images
pull-ci-openshift-microshift-main-security
pull-ci-openshift-microshift-main-test-unit
pull-ci-openshift-microshift-main-verify
pull-ci-openshift-microshift-main-verify-deps
tide

If you are trying to override a checkrun that has a space in it, you must put a double quote on the context.

Details

In response to this:

/override ci/prow/e2e-aws-tests-bootc-release-arm-el9
/override ci/prow/e2e-aws-tests-bootc-release-arm-el10
/override ci/prow/e2e-aws-tests-bootc-release-e10

because errors no related with this change

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

agullon · 2026-04-29T10:48:40Z

/override ci/prow/e2e-aws-tests-bootc-release-el10

openshift-ci · 2026-04-29T10:48:53Z

@agullon: Overrode contexts on behalf of agullon: ci/prow/e2e-aws-tests-bootc-release-el10

Details

In response to this:

/override ci/prow/e2e-aws-tests-bootc-release-el10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

agullon · 2026-04-29T10:49:31Z

/label jira/valid-bug
/label backport-risk-assessed
/lgtm
/verified by CI

openshift-ci · 2026-04-29T10:49:34Z

@agullon: you cannot LGTM your own PR.

Details

In response to this:

/label jira/valid-bug
/label backport-risk-assessed
/lgtm
/verified by CI

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

openshift-ci-robot · 2026-04-29T10:49:43Z

@agullon: This PR has been marked as verified by CI.

Details

In response to this:

/label jira/valid-bug
/label backport-risk-assessed
/lgtm
/verified by CI

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

agullon · 2026-04-29T10:50:41Z

/override ci/prow/e2e-aws-tests-bootc-release-arm-el10
/override ci/prow/e2e-aws-tests-bootc-release-arm-el9

openshift-ci · 2026-04-29T10:50:56Z

@agullon: Overrode contexts on behalf of agullon: ci/prow/e2e-aws-tests-bootc-release-arm-el10, ci/prow/e2e-aws-tests-bootc-release-arm-el9

Details

In response to this:

/override ci/prow/e2e-aws-tests-bootc-release-arm-el10
/override ci/prow/e2e-aws-tests-bootc-release-arm-el9

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

openshift-ci-robot · 2026-04-29T10:54:11Z

@agullon: This pull request references USHIFT-6905 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.22.0" version, but no target version was set.

Retaining the jira/valid-bug label as it was manually added.

Details

In response to this:

This is a cherrypick from #6591

Summary

Consolidate CI test scenarios to reduce VM count without losing test coverage. Tests that ran in dedicated VMs are now piggy-backed onto VMs already provisioned for compatible environments.

The changes are symmetric across el9 and el10 for the y1/y2 upgrade paths and standalone scenarios. el10 has additional operations for the el98→el102 cross-major-version upgrade path which has no el9 equivalent.

Additionally, cleanupWorkload.sh is fixed to use set -eux (was set -ux) so that cleanup failures abort the scenario instead of silently continuing.

test/scenarios-bootc/el9/releases/ (8 deleted, 4 renamed, 2 created, 1 modified → net -6 VMs)

Deleted (8):

el98-lrel@tlsv13-standard1.sh — TLS v1.3 + standard1 already covered by multi-config-standard1

el98-lrel@tlsv13-standard2.sh — TLS v1.3 enforcement is transport-layer; validated by multi-config-standard1 running standard1, so dedicated standard2+TLS v1.3 testing is redundant

el98-lrel@configuration.sh — configuration suite moved into dual-stack-configuration

el98-lrel@fips.sh — FIPS suite moved into ai-model-serving-online-fips

el96-y1@el98-lrel@standard1.sh — standard1 suite moved into el96-y1@lvms-standard1

el96-y1@el98-lrel@standard2.sh — standard2 suite moved into el96-y1@lvms-standard2

el96-y2@el98-lrel@standard1.sh — standard1 suite moved into el96-y2@lvms-standard1

el96-y2@el98-lrel@standard2.sh — standard2 suite moved into el96-y2@lvms-standard2

Renamed (4):

el98-lrel@dual-stack.sh → el98-lrel@dual-stack-configuration.sh — added suites/configuration/

el98-lrel@ai-model-serving-online.sh → el98-lrel@ai-model-serving-online-fips.sh — switched to fips image, added --fips to launch_vm, added suites/fips/

el96-y1@el98-lrel@lvms.sh → el96-y1@el98-lrel@lvms-standard1.sh — added --vm_disksize 30

el96-y2@el98-lrel@lvms.sh → el96-y2@el98-lrel@lvms-standard2.sh — removed ginkgo, added suites/standard2/ after LVMS cleanup

Created (2):

el96-y1@el98-lrel@lvms-standard2.sh — LVMS lifecycle + standard2 after upgrade (replaces deleted standard2)

el96-y2@el98-lrel@lvms-standard1.sh — LVMS lifecycle + ginkgo + standard1 after upgrade (replaces deleted standard1)

Modified (1):

el98-lrel@multi-config-standard1.sh — removed --exclude version and stale comment (now the only place running standard1 with TLS v1.3)

test/scenarios-bootc/el10/releases/ (8 deleted, 5 renamed, 1 created, 3 modified → net -7 VMs)

Same as el9 for standalone and y1/y2 upgrade scenarios, plus additional changes for the el98→el102 cross-major-version upgrade path (no el9 equivalent).

Deleted (8):

el102-lrel@tlsv13-standard1.sh — TLS v1.3 + standard1 already covered by multi-config-standard1

el102-lrel@tlsv13-standard2.sh — TLS v1.3 enforcement is transport-layer; validated by multi-config-standard1 running standard1, so dedicated standard2+TLS v1.3 testing is redundant

el102-lrel@configuration.sh — configuration suite moved into dual-stack-configuration

el102-lrel@fips.sh — FIPS suite moved into ai-model-serving-online-fips

el96-y1@el102-lrel@standard1.sh — standard1 suite moved into upgrade LVMS scenarios

el96-y1@el102-lrel@standard2.sh — standard2 suite moved into upgrade LVMS scenarios

el96-y2@el102-lrel@standard1.sh — standard1 suite moved into el96-y2@lvms-standard1

el96-y2@el102-lrel@standard2.sh — standard2 suite moved into el96-y2@lvms-standard2

Renamed (4 + 1 el98→el102):

el102-lrel@dual-stack.sh → el102-lrel@dual-stack-configuration.sh — added suites/configuration/

el102-lrel@ai-model-serving-online.sh → el102-lrel@ai-model-serving-online-fips.sh — switched to fips image, added --fips to launch_vm, added suites/fips/

el96-y1@el102-lrel@lvms.sh → el96-y1@el102-lrel@lvms-standard1.sh — added --vm_disksize 30

el96-y2@el102-lrel@lvms.sh → el96-y2@el102-lrel@lvms-standard1.sh — added --vm_disksize 30

(el98→el102 only) el98-lrel@el102-lrel@lvms.sh → el96-y1@el102-lrel@lvms-standard2.sh — changed upgrade path from el98→el102 to el96-y1→el102, removed ginkgo, added standard2, added --vm_disksize 30 (el98 LVMS tests absorbed into modified el98-lrel@el102-lrel@standard1/2)

Created (1):

el96-y2@el102-lrel@lvms-standard2.sh — LVMS lifecycle + standard2 after upgrade

Modified (1 + 2 el98→el102):

el102-lrel@multi-config-standard1.sh — removed --exclude version and stale comment

(el98→el102 only) el98-lrel@el102-lrel@standard1.sh — expanded with LVMS lifecycle (create/check/upgrade/validate/cleanup) + --vm_disksize 30, absorbing old el98-lrel@el102-lrel@lvms.sh

(el98→el102 only) el98-lrel@el102-lrel@standard2.sh — expanded with LVMS lifecycle (create/check/upgrade/validate/cleanup) + --vm_disksize 30, absorbing old el98-lrel@el102-lrel@lvms.sh

test/scenarios/releases/ (ostree) (7 deleted, 3 renamed, 2 created, 3 re-enabled → net -2 VMs)

Equivalent to el9 bootc changes (no FIPS or AI model serving scenarios in ostree).

Deleted (7):

el98-lrel@tlsv13-standard1.sh — TLS v1.3 + standard1 already covered by ginkgo-multi-config

el98-lrel@tlsv13-standard2.sh — TLS v1.3 enforcement is transport-layer; validated by ginkgo-multi-config running standard1, so dedicated standard2+TLS v1.3 testing is redundant

el98-lrel@configuration.sh — configuration suite moved into dual-stack-configuration

el96-yminus1@el98-lrel@standard1.sh — standard1 suite moved into yminus1@lvms-standard1

el96-yminus1@el98-lrel@standard2.sh — standard2 suite moved into yminus1@lvms-standard2

el96-yminus2@el98-lrel@standard1.sh — standard1 suite moved into yminus2@lvms-standard1

el96-yminus2@el98-lrel@standard2.sh — standard2 suite moved into yminus2@lvms-standard2

Renamed (3):

el98-lrel@dual-stack.sh → el98-lrel@dual-stack-configuration.sh — added suites/configuration/

el96-yminus1@el98-lrel@lvms.sh → el96-yminus1@el98-lrel@lvms-standard1.sh — added --vm_disksize 30

el96-yminus2@el98-lrel@lvms.sh → el96-yminus2@el98-lrel@lvms-standard2.sh — removed ginkgo, added suites/standard2/ after LVMS cleanup, added --vm_disksize 30

Created (2):

el96-yminus1@el98-lrel@lvms-standard2.sh — LVMS lifecycle + standard2 after upgrade

el96-yminus2@el98-lrel@lvms-standard1.sh — LVMS lifecycle + ginkgo + standard1 after upgrade

Re-enabled (3):

el98@rpm-standard1.sh (was .disabled)

el98@rpm-standard2.sh (was .disabled)

el98@rpm-upgrade.sh (was .disabled)

scripts/lvms-helpers/ (1 modified)

cleanupWorkload.sh — changed set -ux to set -eux so cleanup failures abort the scenario

Total: 23 scenarios deleted, 12 renamed, 5 created, 3 re-enabled, 1 script fixed → net -15 VMs

Test plan

Verify bootc el9 release scenarios discover and run all expected test suites

Verify bootc el10 release scenarios discover and run all expected test suites

Verify ostree release scenarios discover and run all expected test suites

Confirm no test suites were dropped (compare total test count before/after)

🤖 Generated with Claude Code

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

pacevedom

/lgtm

openshift-ci · 2026-04-29T11:33:05Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: agullon, pacevedom

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [agullon,pacevedom]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

agullon · 2026-04-29T14:19:11Z

/retest

openshift-merge-bot · 2026-04-29T16:57:44Z

/retest-required

Remaining retests: 0 against base HEAD 944b137 and 2 for PR HEAD 8d4fd1b in total

agullon · 2026-04-30T06:34:54Z

/retest

agullon · 2026-04-30T08:49:35Z

/override ci/prow/e2e-aws-tests-bootc-release-arm-el10
/override ci/prow/e2e-aws-tests-bootc-release-el10

these failures will be addressed here: https://redhat.atlassian.net/browse/USHIFT-6887

openshift-ci · 2026-04-30T08:50:21Z

@agullon: Overrode contexts on behalf of agullon: ci/prow/e2e-aws-tests-bootc-release-arm-el10, ci/prow/e2e-aws-tests-bootc-release-el10

Details

In response to this:

/override ci/prow/e2e-aws-tests-bootc-release-arm-el10
/override ci/prow/e2e-aws-tests-bootc-release-el10

these failures will be addressed here: https://redhat.atlassian.net/browse/USHIFT-6887

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

agullon · 2026-04-30T10:27:12Z

/retest

openshift-ci · 2026-04-30T12:02:43Z

@agullon: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-aws-tests-bootc-release-el10	`8d4fd1b`	link	true	`/test e2e-aws-tests-bootc-release-el10`
ci/prow/e2e-aws-tests-bootc-release-arm-el10	`8d4fd1b`	link	true	`/test e2e-aws-tests-bootc-release-arm-el10`

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 27, 2026

openshift-ci Bot requested review from eslutsky and pacevedom April 27, 2026 10:03

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 27, 2026

agullon marked this pull request as draft April 27, 2026 10:11

openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 27, 2026

agullon added 6 commits April 27, 2026 13:15

NO-JIRA: re-enable ostree RPM scenarios

bda9bc3

Remove the .disabled suffix from el98 RPM standard1, standard2, and upgrade scenarios to restore their execution in CI. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> pre-commit.check-secrets: ENABLED

agullon force-pushed the USHIFT-consolidate-scenarios branch from 3bcb155 to 7011295 Compare April 27, 2026 11:20

agullon changed the title ~~NO-JIRA: consolidate CI test scenarios to reduce VM count~~ [release-4.22] NO-JIRA: consolidate CI test scenarios to reduce VM count Apr 27, 2026

agullon marked this pull request as ready for review April 27, 2026 13:43

openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 27, 2026

openshift-ci Bot requested review from ggiguash and pmtk April 27, 2026 13:44

agullon changed the title ~~[release-4.22] NO-JIRA: consolidate CI test scenarios to reduce VM count~~ [release-4.22] USHIFT-6905: consolidate CI test scenarios to reduce VM count Apr 27, 2026

agullon mentioned this pull request Apr 27, 2026

USHIFT-6905: consolidate CI test scenarios to reduce VM count #6591

Merged

4 tasks

agullon closed this Apr 27, 2026

agullon reopened this Apr 28, 2026

openshift-ci Bot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. labels Apr 29, 2026

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Apr 29, 2026

pacevedom approved these changes Apr 29, 2026

View reviewed changes

openshift-ci Bot assigned pacevedom Apr 29, 2026

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Apr 29, 2026

openshift-merge-bot Bot merged commit b4429ec into openshift:release-4.22 Apr 30, 2026
19 checks passed

Conversation

agullon commented Apr 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

test/scenarios-bootc/el9/releases/ (8 deleted, 4 renamed, 2 created, 1 modified → net -6 VMs)

test/scenarios-bootc/el10/releases/ (8 deleted, 5 renamed, 1 created, 3 modified → net -7 VMs)

test/scenarios/releases/ (ostree) (7 deleted, 3 renamed, 2 created, 3 re-enabled → net -2 VMs)

scripts/lvms-helpers/ (1 modified)

Test plan

Uh oh!

openshift-ci-robot commented Apr 27, 2026

Summary

Test plan

Uh oh!

coderabbitai Bot commented Apr 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

agullon commented Apr 27, 2026

Uh oh!

agullon commented Apr 27, 2026

Uh oh!

agullon commented Apr 27, 2026

Uh oh!

agullon commented Apr 27, 2026

Uh oh!

openshift-ci-robot commented Apr 27, 2026 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

test/scenarios-bootc/el9/releases/ (8 deleted, 4 renamed, 2 created, 1 modified → net -6 VMs)

test/scenarios-bootc/el10/releases/ (8 deleted, 5 renamed, 1 created, 3 modified → net -7 VMs)

test/scenarios/releases/ (ostree) (7 deleted, 3 renamed, 2 created, 3 re-enabled → net -2 VMs)

scripts/lvms-helpers/ (1 modified)

Test plan

Uh oh!

agullon commented Apr 27, 2026

Uh oh!

agullon commented Apr 28, 2026

Uh oh!

agullon commented Apr 29, 2026

Uh oh!

agullon commented Apr 29, 2026

Uh oh!

agullon commented Apr 29, 2026

Uh oh!

agullon commented Apr 29, 2026

Uh oh!

openshift-ci Bot commented Apr 29, 2026

Uh oh!

agullon commented Apr 29, 2026

Uh oh!

openshift-ci Bot commented Apr 29, 2026

Uh oh!

agullon commented Apr 29, 2026

Uh oh!

openshift-ci Bot commented Apr 29, 2026

Uh oh!

openshift-ci-robot commented Apr 29, 2026

Uh oh!

agullon commented Apr 29, 2026

Uh oh!

openshift-ci Bot commented Apr 29, 2026

Uh oh!

openshift-ci-robot commented Apr 29, 2026 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

test/scenarios-bootc/el9/releases/ (8 deleted, 4 renamed, 2 created, 1 modified → net -6 VMs)

test/scenarios-bootc/el10/releases/ (8 deleted, 5 renamed, 1 created, 3 modified → net -7 VMs)

test/scenarios/releases/ (ostree) (7 deleted, 3 renamed, 2 created, 3 re-enabled → net -2 VMs)

scripts/lvms-helpers/ (1 modified)

Test plan

Uh oh!

pacevedom left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci Bot commented Apr 29, 2026

Uh oh!

agullon commented Apr 29, 2026

Uh oh!

openshift-merge-bot Bot commented Apr 29, 2026

agullon commented Apr 27, 2026 •

edited

Loading

`test/scenarios-bootc/el9/releases/` (8 deleted, 4 renamed, 2 created, 1 modified → net -6 VMs)

`test/scenarios-bootc/el10/releases/` (8 deleted, 5 renamed, 1 created, 3 modified → net -7 VMs)

`test/scenarios/releases/` (ostree) (7 deleted, 3 renamed, 2 created, 3 re-enabled → net -2 VMs)

`scripts/lvms-helpers/` (1 modified)

coderabbitai Bot commented Apr 27, 2026 •

edited

Loading

openshift-ci-robot commented Apr 27, 2026 •

edited by openshift-ci Bot

Loading

`test/scenarios-bootc/el9/releases/` (8 deleted, 4 renamed, 2 created, 1 modified → net -6 VMs)

`test/scenarios-bootc/el10/releases/` (8 deleted, 5 renamed, 1 created, 3 modified → net -7 VMs)

`test/scenarios/releases/` (ostree) (7 deleted, 3 renamed, 2 created, 3 re-enabled → net -2 VMs)

`scripts/lvms-helpers/` (1 modified)

openshift-ci-robot commented Apr 29, 2026 •

edited by openshift-ci Bot

Loading

`test/scenarios-bootc/el9/releases/` (8 deleted, 4 renamed, 2 created, 1 modified → net -6 VMs)

`test/scenarios-bootc/el10/releases/` (8 deleted, 5 renamed, 1 created, 3 modified → net -7 VMs)

`test/scenarios/releases/` (ostree) (7 deleted, 3 renamed, 2 created, 3 re-enabled → net -2 VMs)

`scripts/lvms-helpers/` (1 modified)