wait for component rollout in all cases

[sjenning]

PR #6767 added a check for component rollout only in TestUpgradeControlPlane after the upgrade had been triggered.

However, we need to check this on all rollouts in all tests. WaitForImageRollout() is the function used for this purpose.

Not waiting is causing the feature gate status to skew wrt the CVO version history. On TestUpgradeControlPlane, the FeatureGate status is missing the initial version because the initial rollout is not completing before the upgrade begins.

This moves the new component rollout check into WaitForImageRollout() so that we do it for all HC rollouts in all tests.

My theory is that before #6767, both the FeatureGate status and the CVO were missing the initial version and, thus, the test passed

[openshift-ci-robot]

@sjenning: This pull request references Jira Issue OCPBUGS-61828, which is invalid:

• expected the bug to target the "4.21.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:

PR #6767 added a check for component rollout only in TestUpgradeControlPlane after the upgrade had been triggered.

However, we need to check this on all rollouts in all tests. WaitForImageRollout() is the function used for this purpose.

Not waiting is causing the feature gate status to skew wrt the CVO version history. The FeatureGate status is missing the initial version in its status because the initial rollout is not completing before the upgrade begins.

This moves the new component rollout check into WaitForImageRollout() so that we do it for all HC rollouts in all tests.

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]

Important

Review skipped

Draft detected.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

✨ Finishing touches

🧪 Generate unit tests

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

Tip

👮 Agentic pre-merge checks are now available in preview!

Pro plan users can now enable pre-merge checks in their settings to enforce checklists before merging PRs.

• Built-in checks – Quickly apply ready-made checks to enforce title conventions, require pull request descriptions that follow templates, validate linked issues for compliance, and more.
• Custom agentic checks – Define your own rules using CodeRabbit’s advanced agentic capabilities to enforce organization-specific policies and workflows. For example, you can instruct CodeRabbit’s agent to verify that API documentation is updated whenever API schema files are modified in a PR. Note: Upto 5 custom checks are currently allowed during the preview period. Pricing for this feature will be announced in a few weeks.

Please see the documentation for more information.

Example:

reviews:
  pre_merge_checks:
    custom_checks:
      - name: "Undocumented Breaking Changes"
        mode: "warning"
        instructions: |
          Pass/fail criteria: All breaking changes to public APIs, CLI flags, environment variables, configuration keys, database schemas, or HTTP/GraphQL endpoints must be documented in the "Breaking Change" section of the PR description and in CHANGELOG.md. Exclude purely internal or private changes (e.g., code not exported from package entry points or explicitly marked as internal).

Please share your feedback with us on this Discord post.

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

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

[openshift-ci]

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sjenning

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 [sjenning]

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

[wking]

/title wait for component rollout in all cases

[wking]

/retitle wait for component rollout in all cases

[openshift-ci-robot]

@sjenning: No Jira issue is referenced in the title of this pull request.
To reference a jira issue, add 'XYZ-NNN:' to the title of this pull request and request another refresh with /jira refresh.

Details

In response to this:

PR #6767 added a check for component rollout only in TestUpgradeControlPlane after the upgrade had been triggered.

However, we need to check this on all rollouts in all tests. WaitForImageRollout() is the function used for this purpose.

Not waiting is causing the feature gate status to skew wrt the CVO version history. On TestUpgradeControlPlane, the FeatureGate status is missing the initial version because the initial rollout is not completing before the upgrade begins.

This moves the new component rollout check into WaitForImageRollout() so that we do it for all HC rollouts in all tests.

My theory is that before #6767, both the FeatureGate status and the CVO were missing the initial version and, thus, the test passed

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.