Skip to content

OCPBUGS-82304: Add sleep to give cvo time to reconcile#30988

Open
xueqzhan wants to merge 1 commit intoopenshift:mainfrom
xueqzhan:oc-adm-empty-channel
Open

OCPBUGS-82304: Add sleep to give cvo time to reconcile#30988
xueqzhan wants to merge 1 commit intoopenshift:mainfrom
xueqzhan:oc-adm-empty-channel

Conversation

@xueqzhan
Copy link
Copy Markdown
Contributor

@xueqzhan xueqzhan commented Apr 9, 2026

No description provided.

@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: automatic mode

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Apr 9, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@xueqzhan: This pull request references Jira Issue OCPBUGS-82304, 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)

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.

@xueqzhan
Copy link
Copy Markdown
Contributor Author

xueqzhan commented Apr 9, 2026

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

@openshift-ci openshift-ci bot requested review from petr-muller and wking April 9, 2026 15:08
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 9, 2026

@xueqzhan: 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-2of2

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/e7e14310-3425-11f1-9948-78e0ce1878a6-0

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 9, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: xueqzhan

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 Apr 9, 2026
@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Apr 9, 2026

Walkthrough

A test in the adm_upgrade recommend suite adds a 16-second sleep interval after updating the ClusterVersion channel to empty and enabling state restore, before invoking the oc adm upgrade recommend command. No other logic or assertions are modified.

Changes

Cohort / File(s) Summary
Test Timing Enhancement
test/extended/cli/adm_upgrade/recommend.go
Added 16-second sleep pause in "runs successfully with an empty channel" test following ClusterVersion channel update and state restore enablement.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

Copy link
Copy Markdown

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@test/extended/cli/adm_upgrade/recommend.go`:
- Around line 74-75: Replace the hardcoded time.Sleep(16 * time.Second) with a
condition-based poll using o.Eventually(): write an assertion that repeatedly
queries the same resource/state the sleep was waiting for (e.g., the CVO/channel
status) and returns true when the expected status is observed; use a reasonable
timeout (e.g., 30s) and interval (e.g., 1s) and call o.Eventually(func() bool {
/* fetch status via the same helper or client used elsewhere in recommend.go and
return true when reconciled/pushed to status */ }).Should(BeTrue()) so the test
waits only as long as needed and stops flaking.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 6d14a3a0-c5c1-41f7-906f-a1af637b3d99

📥 Commits

Reviewing files that changed from the base of the PR and between 7da3e1c and a992788.

📒 Files selected for processing (1)
  • test/extended/cli/adm_upgrade/recommend.go

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

Scheduling required tests:
/test e2e-aws-csi
/test e2e-aws-ovn-fips
/test e2e-aws-ovn-microshift
/test e2e-aws-ovn-microshift-serial
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-gcp-csi
/test e2e-gcp-ovn
/test e2e-gcp-ovn-upgrade
/test e2e-metal-ipi-ovn-ipv6
/test e2e-vsphere-ovn
/test e2e-vsphere-ovn-upi

@openshift-trt
Copy link
Copy Markdown

openshift-trt bot commented Apr 9, 2026

Risk analysis has seen new tests most likely introduced by this PR.
Please ensure that new tests meet guidelines for naming and stability.

New Test Risks for sha: a992788

Job Name New Test Risk
pull-ci-openshift-origin-main-e2e-gcp-ovn-upgrade Medium - "[sig-network-edge][Feature:Router][apigroup:gateway.networking.k8s.io] Verify Gateway API functionality during upgrade" is a new test, and was only seen in one job.

New tests seen in this PR at sha: a992788

  • "[sig-network-edge][Feature:Router][apigroup:gateway.networking.k8s.io] Verify Gateway API functionality during upgrade" [Total: 1, Pass: 1, Fail: 0, Flake: 0]

@xueqzhan
Copy link
Copy Markdown
Contributor Author

xueqzhan commented Apr 9, 2026

/retest-required

@xueqzhan
Copy link
Copy Markdown
Contributor Author

/test e2e-aws-ovn-fips

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 10, 2026

@xueqzhan: 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/e2e-aws-ovn-fips a992788 link true /test e2e-aws-ovn-fips

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-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants