Skip to content

Revert "TRT-2549: Revert "Add a serial e2e for accept-risks""#1323

Open
hongkailiu wants to merge 2 commits intoopenshift:mainfrom
hongkailiu:revert-1319-revert-1310-accept-risks-e2e-serial
Open

Revert "TRT-2549: Revert "Add a serial e2e for accept-risks""#1323
hongkailiu wants to merge 2 commits intoopenshift:mainfrom
hongkailiu:revert-1319-revert-1310-accept-risks-e2e-serial

Conversation

@hongkailiu
Copy link
Member

Reverts #1319

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 16, 2026
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Feb 16, 2026

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

Details

In response to this:

Reverts #1319

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 16, 2026
@coderabbitai
Copy link

coderabbitai bot commented Feb 16, 2026

No actionable comments were generated in the recent review. 🎉


Walkthrough

Centralized CVO defaults were added (internal + external packages); code was refactored to use those constants instead of literals; a new end-to-end AcceptRisks test and related test utilities were added; test suite qualifiers and an openshift-tests JSON entry were updated.

Changes

Cohort / File(s) Summary
Constants
pkg/internal/constants.go, pkg/external/constants.go
Added centralized CVO-related constants in pkg/internal and re-exported them from pkg/external (namespace, clusterVersion name, deployment name, container name, conditional update condition type).
Core refactor to use constants
lib/resourcebuilder/apps.go, pkg/cvo/sync_worker.go, pkg/start/start.go, test/cvo/cvo.go
Replaced hard-coded CVO namespace/cluster-version/deployment/container identifiers with the new centralized constants; removed or replaced local literals/defaults.
New end-to-end CVO test
test/cvo/accept_risks.go
Added comprehensive AcceptRisks e2e test that modifies ClusterVersion, collects ConditionalUpdates, applies AcceptRisks, and validates status/release behavior with setup/teardown and polling.
Test utilities
test/util/util.go
Added feature-gate helpers IsTechPreviewNoUpgrade and SkipIfNotTechPreviewNoUpgrade, plus FauxinnatiAPIURL constant and a Gomega import alias.
Test suite metadata & qualifiers
.openshift-tests-extension/openshift_payload_cluster-version-operator.json, cmd/cluster-version-operator-tests/main.go
Inserted a new test entry for "cluster-version-operator should work with accept risks" into the tests JSON; adjusted parallel/serial suite qualifiers to consider Serial label more broadly.

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~45 minutes

✨ Finishing touches
  • 📝 Generate docstrings
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment

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

@hongkailiu
Copy link
Member Author

/payload-job periodic-ci-openshift-release-main-nightly-4.22-e2e-aws-ovn-serial-1of2

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 16, 2026

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

  • periodic-ci-openshift-release-main-nightly-4.22-e2e-aws-ovn-serial-1of2

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/ed4d9690-0b45-11f1-87fd-e14864a60d45-0

The `backup` would not be assigned when the test is skipped earlier
in `BeforeEach`. However, `AfterEach` still runs in that case. As a
result `CV/version` could be updated with unexpected value.

This pull fix the issue by introducing a guard `needRecover` on
`AfterEach` which becomes `true` only after `CV` was updated earlier,
i.e., it was not skipped.
@hongkailiu
Copy link
Member Author

/payload-job periodic-ci-openshift-release-main-nightly-4.22-e2e-aws-ovn-serial-1of2

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 16, 2026

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

  • periodic-ci-openshift-release-main-nightly-4.22-e2e-aws-ovn-serial-1of2

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/8131a350-0b4c-11f1-9b6a-01a988e0484f-0

@hongkailiu
Copy link
Member Author

/payload-aggregate periodic-ci-openshift-release-main-nightly-4.22-e2e-aws-ovn-serial-1of2 10

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 16, 2026

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

  • periodic-ci-openshift-release-main-nightly-4.22-e2e-aws-ovn-serial-1of2

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/5e192b30-0b6b-11f1-9747-e8748fa3f217-0

@hongkailiu
Copy link
Member Author

See #1323 (comment)

/verified by "TheAggregatedJob"

/retest-required

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Feb 16, 2026
@openshift-ci-robot
Copy link
Contributor

@hongkailiu: This PR has been marked as verified by "TheAggregatedJob".

Details

In response to this:

See #1323 (comment)

/verified by "TheAggregatedJob"

/retest-required

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.

@hongkailiu
Copy link
Member Author

/test e2e-hypershift-conformance

@neisw
Copy link
Contributor

neisw commented Feb 17, 2026

/lgtm

/override ci/prow/e2e-hypershift-conformance
failing outside of this pr

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 17, 2026

@neisw: Overrode contexts on behalf of neisw: ci/prow/e2e-hypershift-conformance

Details

In response to this:

/lgtm

/override ci/prow/e2e-hypershift-conformance
failing outside of this pr

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 openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 17, 2026
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 17, 2026

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@petr-muller
Copy link
Member

/override ci/prow/e2e-hypershift-conformance

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 17, 2026

@petr-muller: Overrode contexts on behalf of petr-muller: ci/prow/e2e-hypershift-conformance

Details

In response to this:

/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
Copy link
Contributor

openshift-ci bot commented Feb 17, 2026

@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.

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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

Comments