[release-4.21] OCPBUGS-87008: Stabilize ocl 4.21 by umohnani8 · Pull Request #6138 · openshift/machine-config-operator

umohnani8 · 2026-06-03T15:31:48Z

This is a manual backport of #5652, #5613, and #5595 to stabilize the e2e-ocl test suite.

This also includes breaking the ocl test suite into 2 parts.

openshift-merge-bot · 2026-06-03T15:31:52Z

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

coderabbitai · 2026-06-03T15:31:58Z

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: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 5d506835-c9b0-458d-bda8-b16af58c805c

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

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

openshift-ci-robot · 2026-06-03T15:35:46Z

@umohnani8: This pull request references Jira Issue OCPBUGS-87008, which is invalid:

expected the bug to target either version "4.21." or "openshift-4.21.", but it targets "4.22.0" instead
expected dependent Jira Issue OCPBUGS-86865 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

This is a manual backport of #5652, #5613, and #5595 to stabilize the e2e-ocl test suite.

This also includes breaking the ocl test suite into 2 parts.

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.

umohnani8 · 2026-06-03T15:36:32Z

/jira refresh

openshift-ci-robot · 2026-06-03T15:36:38Z

@umohnani8: This pull request references Jira Issue OCPBUGS-87008, which is invalid:

expected dependent Jira Issue OCPBUGS-86865 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

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.

openshift-ci · 2026-06-03T15:36:41Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: umohnani8

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~~ [umohnani8]

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

Replace the monolithic e2e-ocl test suite with two sharded suites (e2e-ocl-1of2 and e2e-ocl-2of2) and a shared helper package (e2e-ocl-shared) to reduce overall CI time by running in parallel. The sharded tests incorporate all stabilization fixes from main: - Fix cleanup verification timeouts with per-resource contexts - Fix cleanup ordering to delete owners before dependents - Increase poll intervals to avoid rate limiter exhaustion - Make log streaming errors non-fatal - Increase job completion timeout for CI environments - Make TestImagePrunerErrors flexible to registry behavior changes Adapt MachineOSBuild construction calls to use the NewMachineOSBuildFromAPIOrDie API available on this branch. Exclude TestStaleAnnotationClearedOnLayerOnlyChange as it requires a corresponding production fix not present on this branch. Makefile targets: - Remove: test-e2e-ocl (190m) - Add: test-e2e-ocl-1of2 (120m), test-e2e-ocl-2of2 (150m) Signed-off-by: Urvashi <umohnani@redhat.com>

TestMachineOSConfigChangeRestartsBuild flakes because the build controller (running 3 concurrent workers) races between deleteMachineOSConfig for the previous test's MOSC and addMachineOSConfig for the new test's MOSC. Since both MOSCs share the same name, deleteMachineOSConfig's label-based query matches and deletes MOSBs created by the new MOSC. Fix both the controller and test assertions. Signed-off-by: Urvashi <umohnani@redhat.com>

1. Restore assertBuildJobIsAsExpected function and its call sites in both shards. This was present in the 4.21 monolithic suite and validates that build pods use the correct MCO container images. 2. Fix waitForMOSCToUpdateCurrentMOSB in 2of2 to include the empty annotation guard (currentMOSB != "") matching 1of2, so it handles temporarily cleared annotations correctly. 3. Restore strings.Contains in TestSSHKeyAndPasswordForOSBuilder instead of the custom contains() helper from main, matching the original 4.21 implementation. Signed-off-by: Urvashi <umohnani@redhat.com>

openshift-ci · 2026-06-03T21:36:00Z

@umohnani8: The following test 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-gcp-op-ocl	`b57db55`	link	false	`/test e2e-gcp-op-ocl`

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.

umohnani8 changed the title ~~Stabilize ocl 4.21~~ [release-4.21] OCPBUGS-87008: Stabilize ocl 4.21 Jun 3, 2026

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jun 3, 2026

umohnani8 mentioned this pull request Jun 3, 2026

NO-ISSUE: [release-4.21] Stabilize e2e-ocl test suite #5667

Closed

openshift-ci Bot requested review from pablintino and yuqi-zhang June 3, 2026 15:35

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

umohnani8 added 3 commits June 3, 2026 14:32

umohnani8 force-pushed the stabilize-ocl-4.21 branch from b57db55 to 49e33c4 Compare June 3, 2026 18:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[release-4.21] OCPBUGS-87008: Stabilize ocl 4.21#6138

[release-4.21] OCPBUGS-87008: Stabilize ocl 4.21#6138
umohnani8 wants to merge 3 commits into
openshift:release-4.21from
umohnani8:stabilize-ocl-4.21

umohnani8 commented Jun 3, 2026

Uh oh!

openshift-merge-bot Bot commented Jun 3, 2026

Uh oh!

coderabbitai Bot commented Jun 3, 2026 •

edited

Loading

Review skipped

Uh oh!

openshift-ci-robot commented Jun 3, 2026

Uh oh!

umohnani8 commented Jun 3, 2026

Uh oh!

openshift-ci-robot commented Jun 3, 2026

Uh oh!

openshift-ci Bot commented Jun 3, 2026

Uh oh!

openshift-ci Bot commented Jun 3, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

umohnani8 commented Jun 3, 2026

Uh oh!

openshift-merge-bot Bot commented Jun 3, 2026

Uh oh!

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

Uh oh!

Review skipped

Uh oh!

openshift-ci-robot commented Jun 3, 2026

Uh oh!

umohnani8 commented Jun 3, 2026

Uh oh!

openshift-ci-robot commented Jun 3, 2026

Uh oh!

openshift-ci Bot commented Jun 3, 2026

Uh oh!

openshift-ci Bot commented Jun 3, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

coderabbitai Bot commented Jun 3, 2026 •

edited

Loading