TRT-2511:Reapply "OTA-1604: migrate ocp-46922 from otp to cvo repo" #1301

jiajliu · 2026-01-20T07:25:45Z

Revert Revert "OTA-1604: migrate ocp-46922 from otp to cvo repo" #1297 in commit
Fix the issue found in microshift ci test in commit

Added handling for NotFound errors when the Infrastructure resource doesn't exist in IsHypershift, to fix the potential issue like microshift failure
To be consistent with OTP where cvo cases are not labeled for microshift, added SkipIfMicroshift to skip tests when running on a microshift.

coderabbitai · 2026-01-20T07:25:58Z

Walkthrough

This change adds a new test for cluster-version-operator that validates correct runlevel and security context configuration. It includes a JSON test payload entry, a new CVO integration test, and utility helper functions for environment detection and Kubernetes client initialization.

Changes

Cohort / File(s)	Summary
Test Payload Definition `\.openshift-tests-extension/openshift_payload_cluster-version-operator.json`	Added new test payload entry named "[Jira:"Cluster Version Operator"] cluster-version-operator should have correct runlevel and scc" with standard structure (labels, resources, source, lifecycle, environmentSelector).
CVO Integration Tests `test/cvo/cvo.go`	Introduced new test descriptor block with BeforeEach setup obtaining Kubernetes REST config and client, plus test validating: (a) namespace openshift-cluster-version has openshift.io/run-level label (empty value); (b) CVO pod has annotation openshift.io/scc with value hostaccess. Added constant cvoNamespace.
Test Utility Helpers `test/util/util.go`	Created new utility file with functions: IsHypershift and SkipIfHypershift (detect external topology mode), IsMicroshift and SkipIfMicroshift (poll for microshift-version configmap), GetRestConfig (load Kubernetes config), GetKubeClient and GetConfigClient (construct API clients). Includes polling logic with timeout handling and detailed error propagation.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~25 minutes

✨ Finishing touches

📝 Generate docstrings

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

openshift-ci · 2026-01-20T07:26:14Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: jiajliu
Once this PR has been reviewed and has the lgtm label, please assign wking for approval. For more information see the Code Review Process.

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

Details

Needs approval from an approver in each of these files:

OWNERS

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

openshift-ci-robot · 2026-01-20T07:27:15Z

@jiajliu: This pull request references TRT-251 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 story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

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

Actionable comments posted: 1

🤖 Fix all issues with AI agents

In `@test/cvo/cvo.go`:
- Around line 72-82: Update the redundant wording "openshift.io/scc annotation"
to "openshift.io/scc" in the test that inspects the CVO pod: change the
human-readable description string passed to By(...) and the
Expect(...).To(Equal(...)) failure message so they reference "openshift.io/scc"
(use cvoPod.Name and sccAnnotation as already referenced) instead of the
duplicated "annotation" word; ensure the strings around the annotation key are
updated where cvoPod and sccAnnotation are used.

test/cvo/cvo.go

openshift-ci-robot · 2026-01-20T07:39:53Z

@jiajliu: This pull request references TRT-2511 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 bug to target the "4.22.0" version, but no target version was set.

Details

In response to this:

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-robot · 2026-01-20T07:46:24Z

@jiajliu: This pull request references TRT-2511 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 bug to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Revert Revert "OTA-1604: migrate ocp-46922 from otp to cvo repo" #1297 in commit

Fix the issue found in microshift ci test in commit

Added handling for NotFound errors when the Infrastructure resource doesn't exist in IsHypershift, to fix the potential issue like microshift failure

To be consistent with OTP where cvo cases are not labeled for microshift, added SkipIfMicroshift to skip tests when running on a microshift.

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.

jiajliu · 2026-01-20T08:11:16Z

/payload-job periodic-ci-openshift-microshift-release-4.22-periodics-e2e-aws-ovn-ocp-conformance

openshift-ci · 2026-01-20T08:11:24Z

@jiajliu: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-microshift-release-4.22-periodics-e2e-aws-ovn-ocp-conformance

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/988df7e0-f5d7-11f0-87ee-a25503e630b6-0

jiajliu · 2026-01-21T02:34:26Z

Test pass on standard OCP:

$ curl -s https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/pr-logs/pull/openshift_cluster-version-operator/1301/pull-ci-openshift-cluster-version-operator-main-e2e-agnostic-ovn/2013515794691919872/artifacts/e2e-agnostic-ovn/openshift-e2e-test/artifacts/e2e.log|grep "cluster-version-operator should have"
started: 0/32/430 "[Jira:\"Cluster Version Operator\"] cluster-version-operator should have correct runlevel and scc"
passed: (200ms) 2026-01-20T09:35:57 "[Jira:\"Cluster Version Operator\"] cluster-version-operator should have correct runlevel and scc"

Test skip on Microshift:

$ curl -s https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/logs/periodic-ci-openshift-microshift-release-4.22-periodics-e2e-aws-ovn-ocp-conformance/2013783467631841280/artifacts/e2e-aws-ovn-ocp-conformance/openshift-microshift-e2e-origin-conformance/artifacts/e2e.log|grep "cluster-version-operator should have"
started: 0/100/103 "[Jira:\"Cluster Version Operator\"] cluster-version-operator should have correct runlevel and scc"
skipped: (200ms) 2026-01-21T02:37:47 "[Jira:\"Cluster Version Operator\"] cluster-version-operator should have correct runlevel and scc"

/verified by @jiajliu

cc @hongkailiu to review, thanks.

This reverts commit 278da7b.

coderabbitai

Actionable comments posted: 1

🤖 Fix all issues with AI agents

In `@test/cvo/cvo.go`:
- Around line 56-60: The test currently calls SkipIfHypershift(ctx, restCfg) but
misses skipping MicroShift; add a call to SkipIfMicroshift(ctx, restCfg) right
after the SkipIfHypershift invocation, capture its returned error into err2 (or
reuse err) and assert o.Expect(err2).NotTo(o.HaveOccurred(), "Failed to
determine if cluster is MicroShift") so the test exits on MicroShift clusters
before proceeding with CVO checks; ensure you call the same context/restCfg
variables and keep the existing HyperShift skip intact.

test/cvo/cvo.go

hongkailiu · 2026-01-26T07:45:44Z

test/util/util.go

 	infrastructure, err := configClient.ConfigV1().Infrastructures().Get(ctx, "cluster", metav1.GetOptions{})
 	if err != nil {
+		if apierrors.IsNotFound(err) {


Is this what happens on MicroShift?
The linked function does not have it. Maybe we should do it there too?

Yes, it was. There will not the issue in origin because it will return nil whatever err. So it will not break the test.

Maybe add a guard in this function for MicroShift so that we do not need to depend on notFound?

if m,_:=IsMicroshift(ctx, restConfig); m { return false, nil }

openshift-ci · 2026-01-26T08:32:54Z

@jiajliu: 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-agnostic-ovn	`2369a08`	link	true	`/test e2e-agnostic-ovn`
ci/prow/e2e-agnostic-ovn-upgrade-into-change	`2369a08`	link	true	`/test e2e-agnostic-ovn-upgrade-into-change`

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.

jiajliu changed the title ~~TRT-251~~ TRT-251:Reapply "OTA-1604: migrate ocp-46922 from otp to cvo repo" Jan 20, 2026

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

coderabbitai bot reviewed Jan 20, 2026

View reviewed changes

test/cvo/cvo.go Outdated Show resolved Hide resolved

jiajliu force-pushed the revert-1297 branch from 1de355d to 067fd89 Compare January 20, 2026 07:35

jiajliu changed the title ~~TRT-251:Reapply "OTA-1604: migrate ocp-46922 from otp to cvo repo"~~ TRT-2511:Reapply "OTA-1604: migrate ocp-46922 from otp to cvo repo" Jan 20, 2026

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 25, 2026

Reapply "OTA-1604: migrate ocp-46922 from otp to cvo repo"

b3debe7

This reverts commit 278da7b.

jiajliu force-pushed the revert-1297 branch from 067fd89 to ef08863 Compare January 26, 2026 04:20

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 26, 2026

coderabbitai bot reviewed Jan 26, 2026

View reviewed changes

test/cvo/cvo.go Show resolved Hide resolved

jiajliu force-pushed the revert-1297 branch from ef08863 to 2369a08 Compare January 26, 2026 04:46

hongkailiu reviewed Jan 26, 2026

View reviewed changes

skip microshift and handle NotFound error

eda0390

jiajliu force-pushed the revert-1297 branch from 2369a08 to eda0390 Compare January 27, 2026 00:39

TRT-2511:Reapply "OTA-1604: migrate ocp-46922 from otp to cvo repo" #1301

Are you sure you want to change the base?

TRT-2511:Reapply "OTA-1604: migrate ocp-46922 from otp to cvo repo" #1301

Conversation

jiajliu commented Jan 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coderabbitai bot commented Jan 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Estimated code review effort

Uh oh!

openshift-ci bot commented Jan 20, 2026

Uh oh!

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

Uh oh!

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

jiajliu commented Jan 20, 2026

Uh oh!

openshift-ci bot commented Jan 20, 2026

Uh oh!

jiajliu commented Jan 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

hongkailiu Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

jiajliu Jan 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hongkailiu Jan 26, 2026

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Jan 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

jiajliu commented Jan 20, 2026 •

edited

Loading

coderabbitai bot commented Jan 20, 2026 •

edited

Loading

openshift-ci-robot commented Jan 20, 2026 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Jan 20, 2026 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Jan 20, 2026 •

edited by openshift-ci bot

Loading

jiajliu commented Jan 21, 2026 •

edited

Loading

jiajliu Jan 26, 2026 •

edited

Loading