Skip to content

NO-JIRA: Update api upgrade-minor job from 4.21->4.22 to 4.22->5.0 - #80320

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
yuqi-zhang:fix-api-presubmits
Jun 10, 2026
Merged

NO-JIRA: Update api upgrade-minor job from 4.21->4.22 to 4.22->5.0#80320
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
yuqi-zhang:fix-api-presubmits

Conversation

@yuqi-zhang

@yuqi-zhang yuqi-zhang commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

This is failing in openshift/api#2849 since it's using other components from a stale branch

Summary by CodeRabbit

This PR updates the OpenShift API component's CI upgrade-minor job configuration to test a newer upgrade path.

What's changing:
The openshift-api-master__minor.yaml CI configuration file is being updated to advance the tested upgrade path from 4.21→4.22 to 4.22→5.0. This means the e2e-upgrade-minor test that validates the upgrade workflow will now use OpenShift 4.22 as the initial release and test upgrading to 5.0, rather than starting from 4.21.

Why:
According to the PR description, this change addresses failures observed in the API repository's testing (referenced in openshift/api#2849), which were caused by using components from outdated branches during the upgrade testing process.

Technical details:

  • releases.initial.version: 4.214.22
  • releases.latest.name: 4.225.0

The change keeps the existing test infrastructure intact, only advancing which release versions are used for the minor version upgrade validation.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 9, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@yuqi-zhang: This pull request explicitly references no jira issue.

Details

In response to this:

This is failing in openshift/api#2849 since it's using other components from a stale branch

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

coderabbitai Bot commented Jun 9, 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: c1237d14-9b11-45a0-9d0f-e237462094e9

📥 Commits

Reviewing files that changed from the base of the PR and between ea354df and a1c4a48.

📒 Files selected for processing (1)
  • ci-operator/config/openshift/api/openshift-api-master__minor.yaml

Walkthrough

This PR updates OpenShift API release channel metadata by incrementing the initial release version from 4.21 to 4.22 and updating the latest channel identifier from 4.22 to 5.0 in the CI operator configuration.

Changes

Release Channel Metadata Update

Layer / File(s) Summary
Release version and channel metadata
ci-operator/config/openshift/api/openshift-api-master__minor.yaml
The initial release version is bumped from 4.21 to 4.22, and the latest channel name is updated from 4.22 to 5.0, while preserving the include_built_images integration setting.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

Possibly related PRs

  • openshift/release#80144: Both PRs update the OpenShift master configuration to bump release/channel metadata to 5.0 in the ci-operator/config/openshift YAMLs.
  • openshift/release#77698: Both PRs update OpenShift release targeting from 4.22/4.21 to 5.0 by changing the latest channel in the API metadata and CI job definitions.
  • openshift/release#77759: Both PRs update OpenShift release channel/integration identifiers to correct version promotion targets in the CI operator release YAML.

Suggested labels

lgtm, approved, rehearsals-ack

Suggested reviewers

  • Prucek
  • tdomnesc
🚥 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 clearly and specifically describes the main change: updating the api upgrade-minor job configuration from version range 4.21->4.22 to 4.22->5.0, which matches the file modifications in the changeset.
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 PR modifies CI configuration YAML file only, not Ginkgo test code. No test titles to validate against this check.
Test Structure And Quality ✅ Passed This PR changes only CI-operator YAML configuration files and contains no Ginkgo test code. The custom check for test structure and quality is not applicable to YAML CI configuration.
Microshift Test Compatibility ✅ Passed This PR does not add any new Ginkgo e2e tests. It only updates a CI operator configuration file (openshift-api-master__minor.yaml) to change release versions for an upgrade test job.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR only modifies CI operator configuration files; no new Ginkgo e2e tests are added, making SNO compatibility check not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed PR modifies CI operator config with version metadata updates only. No deployment manifests, operator code, controllers, or scheduling constraints are changed.
Ote Binary Stdout Contract ✅ Passed PR is a YAML configuration-only change to ci-operator release metadata; no code changes that could violate OTE Binary Stdout Contract exist.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed This PR modifies only CI configuration metadata (YAML), not Ginkgo e2e test code. The check requires new test code additions, which are not present here.
No-Weak-Crypto ✅ Passed PR only updates version numbers in a YAML config file. No weak crypto patterns (MD5, SHA1, DES, RC4, Blowfish, ECB, custom crypto) detected.
Container-Privileges ✅ Passed The PR modifies only CI-operator config metadata (release versions), not container manifests. No privileged configs, host access, or capability escalations found.
No-Sensitive-Data-In-Logs ✅ Passed The PR changes only a CI configuration file updating version numbers (4.21→4.22, 4.22→5.0). No passwords, tokens, API keys, PII, session IDs, credentials, or sensitive data are present in the changes.

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

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

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

@openshift-ci
openshift-ci Bot requested review from JoelSpeed and everettraven June 9, 2026 22:35
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@yuqi-zhang: 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-api-master-minor-e2e-upgrade-minor openshift/api presubmit Ci-operator config changed
pull-ci-openshift-api-master-minor-images openshift/api presubmit Ci-operator config changed

Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

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.

@pablintino

Copy link
Copy Markdown
Contributor

/pj-rehearse

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@dgoodwin

Copy link
Copy Markdown
Contributor

/lgtm

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

Copy link
Copy Markdown
Contributor

/approve

@openshift-ci

openshift-ci Bot commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dgoodwin, JoelSpeed, yuqi-zhang

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 Jun 10, 2026
@dgoodwin

Copy link
Copy Markdown
Contributor

/override ci/rehearse/openshift/api/master/minor-e2e-upgrade-minor

https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_release/80320/rehearse-80320-pull-ci-openshift-api-master-minor-e2e-upgrade-minor/2064645697524731904 failed on

[Monitor:audit-log-analyzer][sig-api-machinery][Feature:APIServer] API LBs follow /readyz of kube-apiserver and stop sending requests before server shutdowns for external clients

Which is a known flake.

@openshift-ci

openshift-ci Bot commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

@dgoodwin: Overrode contexts on behalf of dgoodwin: ci/rehearse/openshift/api/master/minor-e2e-upgrade-minor

Details

In response to this:

/override ci/rehearse/openshift/api/master/minor-e2e-upgrade-minor

https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_release/80320/rehearse-80320-pull-ci-openshift-api-master-minor-e2e-upgrade-minor/2064645697524731904 failed on

[Monitor:audit-log-analyzer][sig-api-machinery][Feature:APIServer] API LBs follow /readyz of kube-apiserver and stop sending requests before server shutdowns for external clients

Which is a known flake.

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-merge-bot

Copy link
Copy Markdown
Contributor

@dgoodwin: your /pj-rehearse request was not processed because the request waited in queue for longer than 5 minutes. Please retry in a few minutes.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@openshift-ci[bot]: your /pj-rehearse request was not processed because the request waited in queue for longer than 5 minutes. Please retry in a few minutes.

1 similar comment
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@openshift-ci[bot]: your /pj-rehearse request was not processed because the request waited in queue for longer than 5 minutes. Please retry in a few minutes.

@dgoodwin

Copy link
Copy Markdown
Contributor

/override ci/rehearse/openshift/api/master/minor-e2e-upgrade-minor

@openshift-ci

openshift-ci Bot commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

@dgoodwin: Overrode contexts on behalf of dgoodwin: ci/rehearse/openshift/api/master/minor-e2e-upgrade-minor

Details

In response to this:

/override ci/rehearse/openshift/api/master/minor-e2e-upgrade-minor

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.

@pablintino

Copy link
Copy Markdown
Contributor

/pj-rehearse ack

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Jun 10, 2026
@openshift-ci

openshift-ci Bot commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

@yuqi-zhang: 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/api/master/minor-e2e-upgrade-minor a1c4a48 link unknown /pj-rehearse pull-ci-openshift-api-master-minor-e2e-upgrade-minor

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-merge-bot
openshift-merge-bot Bot merged commit e31d913 into openshift:main Jun 10, 2026
16 checks passed
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@openshift-ci[bot]: your /pj-rehearse request was not processed because the request waited in queue for longer than 5 minutes. Please retry in a few minutes.

krisnababu pushed a commit to krisnababu/release that referenced this pull request Jun 29, 2026
krisnababu pushed a commit to oharan2/release that referenced this pull request Jul 3, 2026
andrej1991 pushed a commit to andrej1991/release that referenced this pull request Jul 6, 2026
TimurMP pushed a commit to TimurMP/release that referenced this pull request Jul 8, 2026
SachinNinganure pushed a commit to SachinNinganure/release that referenced this pull request Jul 20, 2026
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. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants