OCPBUGS-78061: Fix invalid ClusterVersion.Spec.DesiredUpdate

[hongkailiu]

I did not do it this way probably because we did not have #1335 at the time. I had to feed some valid values.

Without this pull, we hit the issue specially when multi-arch actually has a non-empty value (provided image is usually not empty).

Summary by CodeRabbit

• Tests
  • Updated test handling for acceptance risk scenarios.

[openshift-ci-robot]

@hongkailiu: This pull request references Jira Issue OCPBUGS-78061, which is invalid:

• expected the bug to target the "4.22.0" version, but no target version was set

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:

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]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 218cc21c-c07e-4e7d-a1e1-08887aebfea7

📥 Commits

Reviewing files that changed from the base of the PR and between c4fb92f and daf40a7.

📒 Files selected for processing (1)

• test/cvo/accept_risks.go

---

Walkthrough

This change modifies the initialization behavior of cv.Spec.DesiredUpdate in the accept risks test. Previously, when DesiredUpdate was nil, the code constructed a new Update object by copying Image, Version, and Architecture from cv.Status.Desired. The patch now initializes an empty Update{} structure instead, assigning only AcceptRisks and leaving other fields zero-valued.

Changes

Cohort / File(s)	Summary
Accept Risks Test Logic test/cvo/accept_risks.go	Changed initialization of cv.Spec.DesiredUpdate from copying desired status fields to creating an empty Update with only AcceptRisks assigned, altering test fixture setup and expected values.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Test Structure And Quality	⚠️ Warning	Test file lacks meaningful failure messages on majority of assertions, violating established codebase pattern of including diagnostic context on all Expect statements.	Add meaningful failure messages to all Expect assertions following codebase pattern, e.g., change Expect(err).NotTo(o.HaveOccurred()) to Expect(err).NotTo(o.HaveOccurred(), "context message").

✅ Passed checks (4 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title directly and specifically describes the main change: fixing an invalid ClusterVersion.Spec.DesiredUpdate, which aligns with the primary code modification in accept_risks.go.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Stable And Deterministic Test Names	✅ Passed	Test file contains stable and deterministic test names complying with Ginkgo naming requirements with no dynamic information.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Post copyable unit tests in a comment

Tip

Try Coding Plans. Let us write the prompt for your AI agent so you can ship faster (with fewer bugs).
Share your feedback on Discord.

---

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

[hongkailiu]

/payload-job periodic-ci-openshift-multiarch-main-nightly-4.22-ocp-e2e-aws-ovn-techpreview-serial-multi-a-a-1of3

[openshift-ci]

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

• periodic-ci-openshift-multiarch-main-nightly-4.22-ocp-e2e-aws-ovn-techpreview-serial-multi-a-a-1of3

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/c7fd2870-1c7e-11f1-9da0-20087467471c-0

[hongkailiu]

https://prow.ci.openshift.org/view/gs/test-platform-results/logs/openshift-cluster-version-operator-1345-nightly-4.22-ocp-e2e-aws-ovn-techpreview-serial-multi-a-a-1of3/2031350311213338624 from #1345 (comment) failed in pre.

/payload-aggregate periodic-ci-openshift-multiarch-main-nightly-4.22-ocp-e2e-aws-ovn-techpreview-serial-multi-a-a-1of3 10

[openshift-ci]

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

• periodic-ci-openshift-multiarch-main-nightly-4.22-ocp-e2e-aws-ovn-techpreview-serial-multi-a-a-1of3

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/5883dc90-1c89-11f1-885b-f60f175ee98e-0

[hongkailiu]

/jira refresh

[openshift-ci-robot]

@hongkailiu: This pull request references Jira Issue OCPBUGS-78061, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.22.0) matches configured target version for branch (4.22.0)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @jiajliu

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.

[wking]

/lgtm

[hongkailiu]

The failure in e2e-asw-ovn-techpreview seems unrelated.

/retest-required

[hongkailiu]

#1345 (comment) has troubles to trigger the job. Coming back to one run:

/payload-job periodic-ci-openshift-multiarch-main-nightly-4.22-ocp-e2e-aws-ovn-techpreview-serial-multi-a-a-1of3

[openshift-ci]

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

• periodic-ci-openshift-multiarch-main-nightly-4.22-ocp-e2e-aws-ovn-techpreview-serial-multi-a-a-1of3

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/767fb480-1c9d-11f1-96eb-fbfd41872d06-0

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hongkailiu, wking

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 [hongkailiu,wking]

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

[wking]

Rehearsal attempt failed to install again. Change makes sense to me. Let's just merge and see if it helps.

/verified by @wking

[openshift-ci-robot]

@wking: This PR has been marked as verified by @wking.

Details

In response to this:

Rehearsal attempt failed to install again. Change makes sense to me. Let's just megre and see if it helps.

/verified by @wking

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.

[wking]

Boskos quotas are really hitting us hard. Over all CI in the past 24h:

$ curl -s 'https://search.dptools.openshift.org/search?maxAge=24h&type=build-log&context=0&search=Acquiring+leases+for&search=Failed+to+acquire+resource.*free.*leased' | jq -r 'to_entries[].value | select(length == 2)["Acquiring leases for"][].context[]' | grep -o '[^[ ]*-slice' | sort | uniq -c | sort -n
      1 azure-autorelease-qe-quota-slice
      1 nutanix-qe-quota-slice
      1 openstack-vh-mecha-central-quota-slice
      1 vsphere-connected-2-quota-slice
      2 azure-observability-quota-slice
      3 libvirt-s390x-2-quota-slice
      4 libvirt-s390x-amd64-quota-slice
     16 hypershift-azure-quota-slice
     20 hypershift-aws-quota-slice
     30 hypershift-aks-quota-slice
     31 azure4-quota-slice

Rather than consuming more of the azure4 and hypershift-* buckets with retests, I'll just override this CI-only change, and we'll see how it plays post-merge.

/override ci/prow/e2e-agnostic-ovn-techpreview-serial-2of3
/override ci/prow/e2e-agnostic-ovn-techpreview-serial-3of3
/override ci/prow/e2e-aws-ovn-techpreview
/override ci/prow/e2e-hypershift
/override ci/prow/e2e-hypershift-conformance

[openshift-ci]

@wking: Overrode contexts on behalf of wking: ci/prow/e2e-agnostic-ovn-techpreview-serial-2of3, ci/prow/e2e-agnostic-ovn-techpreview-serial-3of3, ci/prow/e2e-aws-ovn-techpreview, ci/prow/e2e-hypershift, ci/prow/e2e-hypershift-conformance

Details

In response to this:

Boskos quotas are really hitting us hard. Over all CI in the past 24h:

$ curl -s 'https://search.dptools.openshift.org/search?maxAge=24h&type=build-log&context=0&search=Acquiring+leases+for&search=Failed+to+acquire+resource.*free.*leased' | jq -r 'to_entries[].value | select(length == 2)["Acquiring leases for"][].context[]' | grep -o '[^[ ]*-slice' | sort | uniq -c | sort -n
     1 azure-autorelease-qe-quota-slice
     1 nutanix-qe-quota-slice
     1 openstack-vh-mecha-central-quota-slice
     1 vsphere-connected-2-quota-slice
     2 azure-observability-quota-slice
     3 libvirt-s390x-2-quota-slice
     4 libvirt-s390x-amd64-quota-slice
    16 hypershift-azure-quota-slice
    20 hypershift-aws-quota-slice
    30 hypershift-aks-quota-slice
    31 azure4-quota-slice

Rather than consuming more of the azure4 and hypershift-* buckets with retests, I'll just override this CI-only change, and we'll see how it plays post-merge.

/override ci/prow/e2e-agnostic-ovn-techpreview-serial-2of3
/override ci/prow/e2e-agnostic-ovn-techpreview-serial-3of3
/override ci/prow/e2e-aws-ovn-techpreview
/override ci/prow/e2e-hypershift
/override ci/prow/e2e-hypershift-conformance

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]

@hongkailiu: all tests passed!

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]

@hongkailiu: Jira Issue Verification Checks: Jira Issue OCPBUGS-78061
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-78061 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

I did not do it this way probably because we did not have #1335 at the time. I had to feed some valid values.

Without this pull, we hit the issue specially when multi-arch actually has a non-empty value (provided image is usually not empty).

Summary by CodeRabbit

• Tests
• Updated test handling for acceptance risk scenarios.

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.