Skip to content

test: add clusterresourceoverride-operator upgrade test enhancements#81424

Open
maxcao13 wants to merge 1 commit into
openshift:mainfrom
maxcao13:cro
Open

test: add clusterresourceoverride-operator upgrade test enhancements#81424
maxcao13 wants to merge 1 commit into
openshift:mainfrom
maxcao13:cro

Conversation

@maxcao13

@maxcao13 maxcao13 commented Jul 2, 2026

Copy link
Copy Markdown
Member

See openshift/cluster-resource-override-admission-operator#215

Depends on openshift/cluster-resource-override-admission-operator#215

Summary by CodeRabbit

Updated the cluster-resource-override-admission-operator CI upgrade workflow (e2e-aws-upgrade) to improve clusterresourceoverride-operator upgrade test coverage. The job now patches the previous CSV to reference the previous operand container via $PREVIOUS_OPERAND, adds PREVIOUS_OPERAND to the job’s base images (sourced from the ocp namespace tag 4.22), and introduces a new pre-check stage that sets KUBECTL and runs make e2e-upgrade-pre before the main upgrade test.

The post-upgrade command sequence was also adjusted to run make e2e-upgrade-post e2e instead of make e2e, ensuring upgrade-specific validation is performed alongside the end-to-end checks.

@openshift-ci openshift-ci Bot requested review from jkyros and joelsmith July 2, 2026 22:58
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 2, 2026
@coderabbitai

coderabbitai Bot commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: f7745b58-63eb-4d31-8f0c-c9746bbd6249

📥 Commits

Reviewing files that changed from the base of the PR and between 4c3b94d and cf0f0fc.

📒 Files selected for processing (1)
  • ci-operator/config/openshift/cluster-resource-override-admission-operator/openshift-cluster-resource-override-admission-operator-main.yaml
🚧 Files skipped from review as they are similar to previous changes (1)
  • ci-operator/config/openshift/cluster-resource-override-admission-operator/openshift-cluster-resource-override-admission-operator-main.yaml

Walkthrough

The upgrade CI job now includes a previous operand image, patches the prior CSV to use it, adds a pre-check step, and changes the post-upgrade command sequence.

Changes

Upgrade CI Workflow Update

Layer / File(s) Summary
Previous operand image and CSV patching
ci-operator/config/openshift/cluster-resource-override-admission-operator/openshift-cluster-resource-override-admission-operator-main.yaml
Adds a previous-operand base image and updates the install-time CSV patch to replace the operand container env value with $PREVIOUS_OPERAND.
Pre-check and upgrade command
ci-operator/config/openshift/cluster-resource-override-admission-operator/openshift-cluster-resource-override-admission-operator-main.yaml
Adds a PREVIOUS_OPERAND dependency, introduces a pre-check step that runs make e2e-upgrade-pre, and changes the final command to make e2e-upgrade-post e2e.

Estimated code review effort: 2 (Simple) | ~10 minutes

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title is concise and matches the main change: upgrade test enhancements for clusterresourceoverride-operator.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed Only a ci-operator YAML changed; no Ginkgo It/Describe/Context/When titles were added or modified, so no unstable test names were introduced.
Test Structure And Quality ✅ Passed Only a ci-operator YAML changed; no Ginkgo test files or helpers were modified, so the test-structure/quality check is not applicable.
Microshift Test Compatibility ✅ Passed PASS: The PR only updates ci-operator YAML; no Ginkgo e2e tests or MicroShift-sensitive APIs/features were added or changed.
Single Node Openshift (Sno) Test Compatibility ✅ Passed Only ci-operator YAML changed; no Ginkgo It/Describe/Context/When tests were added or modified, so SNO compatibility review is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed Only CI test config changed; no deployment manifests, controller code, or new scheduling constraints were added.
Ote Binary Stdout Contract ✅ Passed Only a ci-operator YAML changed; no process-level code or stdout writes were introduced, so the OTE stdout contract is unaffected.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed Only ci-operator YAML changed; no new Ginkgo tests or IPv4/public-internet assumptions were added, and the commands use cluster-internal images/oc.
No-Weak-Crypto ✅ Passed PR only edits CI job YAML; no MD5/SHA1/DES/RC4/3DES/Blowfish/ECB or secret-comparison code is introduced.
Container-Privileges ✅ Passed Touched ci-operator YAML adds upgrade test steps only; the file has no privileged/hostNetwork/hostPID/hostIPC/allowPrivilegeEscalation/SYS_ADMIN settings.
No-Sensitive-Data-In-Logs ✅ Passed Diff only updates CI config and shell commands; no additions expose passwords, tokens, PII, hostnames, or customer data in logs.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands.

@joelsmith

Copy link
Copy Markdown
Contributor

/lgtm

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

openshift-ci Bot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: joelsmith, maxcao13

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

Signed-off-by: Max Cao <macao@redhat.com>
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 3, 2026
@openshift-ci

openshift-ci Bot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor

New changes are detected. LGTM label has been removed.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@maxcao13: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-cluster-resource-override-admission-operator-main-ci-bundle-cluster-resource-override-admission-operator-bundle openshift/cluster-resource-override-admission-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-resource-override-admission-operator-main-e2e-aws-olm openshift/cluster-resource-override-admission-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-resource-override-admission-operator-main-e2e-aws-operator openshift/cluster-resource-override-admission-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-resource-override-admission-operator-main-e2e-aws-upgrade openshift/cluster-resource-override-admission-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-resource-override-admission-operator-main-images openshift/cluster-resource-override-admission-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-resource-override-admission-operator-main-security openshift/cluster-resource-override-admission-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-resource-override-admission-operator-main-unit openshift/cluster-resource-override-admission-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-resource-override-admission-operator-main-verify openshift/cluster-resource-override-admission-operator presubmit Ci-operator config changed
pull-ci-openshift-cluster-resource-override-admission-operator-main-verify-deps openshift/cluster-resource-override-admission-operator presubmit Ci-operator config changed
Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@maxcao13

maxcao13 commented Jul 3, 2026

Copy link
Copy Markdown
Member Author

/pj-rehearse pull-ci-openshift-cluster-resource-override-admission-operator-main-e2e-aws-upgrade

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@maxcao13: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@maxcao13

maxcao13 commented Jul 3, 2026

Copy link
Copy Markdown
Member Author

/pj-rehearse pull-ci-openshift-cluster-resource-override-admission-operator-main-e2e-aws-upgrade

Weird infra flake again.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@maxcao13: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-ci

openshift-ci Bot commented Jul 4, 2026

Copy link
Copy Markdown
Contributor

@maxcao13: 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/rehearse/openshift/cluster-resource-override-admission-operator/main/e2e-aws-upgrade cf0f0fc link unknown /pj-rehearse pull-ci-openshift-cluster-resource-override-admission-operator-main-e2e-aws-upgrade

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.

2 participants