Skip to content

[release-4.20] Backport ocl test fixes and shard the test suite#6305

Open
umohnani8 wants to merge 5 commits into
openshift:release-4.20from
umohnani8:backport-ocl-4.20
Open

[release-4.20] Backport ocl test fixes and shard the test suite#6305
umohnani8 wants to merge 5 commits into
openshift:release-4.20from
umohnani8:backport-ocl-4.20

Conversation

@umohnani8

Copy link
Copy Markdown
Contributor

Backport test fixes for the OCL test suite.
Shard the OCL test suite into 2 parts.
Remove the skopeo-install script.

umohnani8 and others added 5 commits July 14, 2026 15:30
Replace the monolithic test/e2e-ocl/ directory with a sharded layout
matching the structure on release-4.21 and later:

- test/e2e-ocl-shared/: Common helpers and Containerfiles used by both shards
- test/e2e-ocl-1of2/: First shard (8 tests: layering, rollout, rebuild, entitled, etc.)
- test/e2e-ocl-2of2/: Second shard (8 tests: OKD, failure recovery, deletion, etc.)

Stabilization fixes included:
- CleanupEphemeralBuildObjects: owners-before-dependents deletion ordering
  with per-resource 3-minute timeout and 5s poll interval
- StreamContainerLogToFile: non-fatal with 5s retry sleep
- waitForJobToReachCondition: timeout bumped from 10m to 20m
- imagepruner: dual-flag handling for Docker.io/GitHub registry error variance
- Non-fatal log streaming throughout test helpers

Tests excluded from backport (new features not on 4.20):
- TestCurrentMachineOSBuildAnnotationHandling
- TestLayeredImageServingDuringNodeScaleUp
- TestStaleAnnotationClearedOnLayerOnlyChange

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Urvashi <umohnani@redhat.com>
Add metav1.IsControlledBy guard before deleting MachineOSBuilds during
MachineOSConfig deletion. Without this check, if a MOSC is deleted and
recreated with the same name but a different UID, the controller could
incorrectly delete MOSBs belonging to the new MOSC.

Signed-off-by: Urvashi <umohnani@redhat.com>
When polling for MachineOSBuild conditions, a transient NotFound error
can occur if the object is briefly absent (e.g., during recreation).
Return false instead of erroring out so the poll continues retrying.

Signed-off-by: Urvashi <umohnani@redhat.com>
When a build job already exists (AlreadyExists on create), the MOSB was
not being annotated with the job's UID. This caused getJobForMOSB to
spin indefinitely waiting for an annotation that never appeared on the
reuse path. Now fetch the existing job and annotate the MOSB before
returning.

Signed-off-by: Urvashi <umohnani@redhat.com>
Remove the skopeo-install script used for the OCL test suite as it has
now been added as part of the CI config in openshift/release.

Cherry-pick of openshift#6202

Signed-off-by: Urvashi <umohnani@redhat.com>
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

coderabbitai Bot commented Jul 14, 2026

Copy link
Copy Markdown

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: 5b2023f3-94f2-4047-94b6-5eec9c8193b2

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.

@openshift-ci openshift-ci Bot requested review from djoshy and pablintino July 14, 2026 19:32
@openshift-ci

openshift-ci Bot commented Jul 14, 2026

Copy link
Copy Markdown
Contributor

[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:

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

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

openshift-ci Bot commented Jul 14, 2026

Copy link
Copy Markdown
Contributor

@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/verify 5bee287 link true /test verify

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant