Skip to content

USHIFT-7487: Bump CRI-O dependency to 5.1.0 for release-5.1 - #7249

Open
eslutsky wants to merge 2 commits into
openshift:mainfrom
eslutsky:bump-crio-5.1
Open

USHIFT-7487: Bump CRI-O dependency to 5.1.0 for release-5.1#7249
eslutsky wants to merge 2 commits into
openshift:mainfrom
eslutsky:bump-crio-5.1

Conversation

@eslutsky

@eslutsky eslutsky commented Aug 26, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Update CRI-O version requirement from >= 1.36.0, < 1.37.0 to >= 5.1.0, < 5.2.0 in the RPM spec to match the OCP 5.1 dependency repo
  • cri-tools stays at 1.36.0 as that is the version shipped in the 5.1-el9-beta repo

Test plan

  • Verify RPM builds successfully with the updated dependency
  • Verify MicroShift installs with cri-o-5.1.0 from the 5.1 repo

🤖 Generated with Claude Code

Summary by CodeRabbit

  • Bug Fixes

    • Updated the MicroShift RPM package to require a compatible CRI-O version in the 5.1.x release range.
    • Updated beta dependency references to use the 5.1 repository path.
  • Chores

    • Updated release metadata and repository mappings for the 5.1 release cycle, including compatibility with 5.0 and 4.22 repositories.

Update the CRI-O version requirement in the RPM spec to match the
OCP 5.1 dependency repository (cri-o-5.1.0). cri-tools remains at
1.36.0 as that is the version shipped in the 5.1-el9-beta repo.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Aug 26, 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: 09ace2a5-8bc7-4571-943a-71ccb6cd660c

📥 Commits

Reviewing files that changed from the base of the PR and between 37f88c5 and c85b782.

📒 Files selected for processing (2)
  • packaging/rpm/microshift.spec
  • test/bin/common_versions.sh
🚧 Files skipped from review as they are similar to previous changes (1)
  • packaging/rpm/microshift.spec

Included review availability: Your plan provides up to 12 included reviews per hour; 11 remain after this review.


Walkthrough

The changes align MicroShift release metadata with OpenShift 5.1 and update the RPM CRI-O dependency to the 5.1.x version range.

Changes

Release alignment

Layer / File(s) Summary
Release metadata and repository lookup updates
test/bin/common_versions.sh
Release variables now target 5.1, 5.0, and 4.22. Previous and y-2 release versions use beta mirror lookups. Beta dependency variables use the 5.1 and 5.0 repositories.
CRI-O dependency update
packaging/rpm/microshift.spec
The RPM requires CRI-O >= 5.1.0 and < 5.2.0.

Estimated code review effort: 2 (Simple) | ~10 minutes

Merge Risk: ⚪ Minimal · up to c85b7

This localized dependency version update presents no actionable merge-blocking risk at the current head; it is merge-ready after normal checks and review.

Suggested reviewers: jogeo, kasturinarra, agullon

🚥 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 concisely identifies the main change: updating the CRI-O dependency to version 5.1.0 for the release-5.1 cycle.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 1…
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 PASS: The complete pull-request range changes only packaging/rpm/microshift.spec and test/bin/common_versions.sh. It adds no Ginkgo test declarations or test titles, and no changed line contains `…
Test Structure And Quality ✅ Passed PASS: The pull request changes only packaging/rpm/microshift.spec and test/bin/common_versions.sh. The cumulative diff contains no Ginkgo test files or Ginkgo constructs such as It, BeforeEach
Microshift Test Compatibility ✅ Passed PASS: The pull request changes only packaging/rpm/microshift.spec and test/bin/common_versions.sh. The diff adds no Ginkgo tests or test cases using It, Describe, Context, or When, and it …
Single Node Openshift (Sno) Test Compatibility ✅ Passed PASS — The pull request changes only the RPM spec and test/bin/common_versions.sh. The complete topic diff adds no Ginkgo declarations (It, Describe, Context, or When) and no e2e test files.…
Topology-Aware Scheduling Compatibility ✅ Passed PASS: The check is not applicable. The verified diff changes only RPM dependency metadata, release-version test variables, and an unrelated GitHub utility constant. No deployment manifest, operator, o…
Ote Binary Stdout Contract ✅ Passed PASS: The PR changes only packaging/rpm/microshift.spec and test/bin/common_versions.sh. The patch contains no OTE binary, Go, Ginkgo, main, suite-setup, or logging changes. The changed shell comm…
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PASS: The pull request adds no Ginkgo e2e tests. The diff contains only packaging/rpm/microshift.spec and test/bin/common_versions.sh; it adds no It(), Describe(), Context(), or When() tes…
No-Weak-Crypto ✅ Passed PASS: The pull request changes only RPM version constraints and release-version metadata. The committed diff contains no MD5, SHA1, DES, 3DES, RC4, Blowfish, ECB, custom cryptography, or secret/token …
Container-Privileges ✅ Passed The pull request changes only packaging/rpm/microshift.spec and test/bin/common_versions.sh. The exact diff contains RPM dependency and release-repository/version updates only. It adds no containe…
No-Sensitive-Data-In-Logs ✅ Passed PASS: The pull request changes only an RPM dependency constraint and release/version repository variables. The exact diffs add no logging statements or sensitive values. common_versions.sh only echo…
Full details: Docstring Coverage

Explanation

No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 1 files. (1 skipped: 1 unsupported.)

Full details: Stable And Deterministic Test Names

Explanation

PASS: The complete pull-request range changes only packaging/rpm/microshift.spec and test/bin/common_versions.sh. It adds no Ginkgo test declarations or test titles, and no changed line contains It(), Describe(), Context(), or When() usage. Therefore, the check has no applicable failure.

Full details: Test Structure And Quality

Explanation

PASS: The pull request changes only packaging/rpm/microshift.spec and test/bin/common_versions.sh. The cumulative diff contains no Ginkgo test files or Ginkgo constructs such as It, BeforeEach, AfterEach, Eventually, or Consistently. Therefore, the stated Ginkgo test-quality requirements are not applicable.

Full details: Microshift Test Compatibility

Explanation

PASS: The pull request changes only packaging/rpm/microshift.spec and test/bin/common_versions.sh. The diff adds no Ginkgo tests or test cases using It, Describe, Context, or When, and it adds no OpenShift API or MicroShift-incompatible feature references. The custom check therefore has no applicable failure condition.

Full details: Single Node Openshift (Sno) Test Compatibility

Explanation

PASS — The pull request changes only the RPM spec and test/bin/common_versions.sh. The complete topic diff adds no Ginkgo declarations (It, Describe, Context, or When) and no e2e test files. The SNO compatibility check is therefore not applicable.

Full details: Topology-Aware Scheduling Compatibility

Explanation

PASS: The check is not applicable. The verified diff changes only RPM dependency metadata, release-version test variables, and an unrelated GitHub utility constant. No deployment manifest, operator, or controller code changes were made, and no scheduling fields appear in the added or removed lines.

Full details: Ote Binary Stdout Contract

Explanation

PASS: The PR changes only packaging/rpm/microshift.spec and test/bin/common_versions.sh. The patch contains no OTE binary, Go, Ginkgo, main, suite-setup, or logging changes. The changed shell commands only update package and release-version variables, so they do not introduce a process-level stdout write that can corrupt JSON output.

Full details: Ipv6 And Disconnected Network Test Compatibility

Explanation

PASS: The pull request adds no Ginkgo e2e tests. The diff contains only packaging/rpm/microshift.spec and test/bin/common_versions.sh; it adds no It(), Describe(), Context(), or When() test code. Therefore, the IPv4 and disconnected-network test compatibility check is not applicable.

Full details: No-Weak-Crypto

Explanation

PASS: The pull request changes only RPM version constraints and release-version metadata. The committed diff contains no MD5, SHA1, DES, 3DES, RC4, Blowfish, ECB, custom cryptography, or secret/token comparisons. The cri-o and cri-tools dependency changes are package version changes, not cryptographic usage.

Full details: Container-Privileges

Explanation

The pull request changes only packaging/rpm/microshift.spec and test/bin/common_versions.sh. The exact diff contains RPM dependency and release-repository/version updates only. It adds no container or Kubernetes manifest fields such as privileged, hostPID, hostNetwork, hostIPC, SYS_ADMIN, allowPrivilegeEscalation, or root settings.

Full details: No-Sensitive-Data-In-Logs

Explanation

PASS: The pull request changes only an RPM dependency constraint and release/version repository variables. The exact diffs add no logging statements or sensitive values. common_versions.sh only echoes package-version results from dnf/rpm; its changed URLs are public OpenShift mirror URLs, and command errors are redirected to /dev/null. No passwords, tokens, API keys, PII, session IDs, customer data, or internal hostnames are introduced into logs.

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

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

@openshift-ci
openshift-ci Bot requested review from jogeo and kasturinarra August 26, 2026 15:16
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 26, 2026
@eslutsky eslutsky changed the title Bump CRI-O dependency to 5.1.0 for release-5.1 USHIFT-7487: Bump CRI-O dependency to 5.1.0 for release-5.1 Aug 26, 2026
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 26, 2026
@openshift-ci-robot

openshift-ci-robot commented Aug 26, 2026

Copy link
Copy Markdown

@eslutsky: This pull request references USHIFT-7487 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 bug to target the "5.1.0" version, but no target version was set.

Details

In response to this:

Summary

  • Update CRI-O version requirement from >= 1.36.0, < 1.37.0 to >= 5.1.0, < 5.2.0 in the RPM spec to match the OCP 5.1 dependency repo
  • cri-tools stays at 1.36.0 as that is the version shipped in the 5.1-el9-beta repo

Test plan

  • Verify RPM builds successfully with the updated dependency
  • Verify MicroShift installs with cri-o-5.1.0 from the 5.1 repo

🤖 Generated with Claude Code

Summary by CodeRabbit

  • Bug Fixes
  • Updated the MicroShift RPM package to require a compatible CRI-O version in the 5.1.x release range.

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.

@pacevedom

Copy link
Copy Markdown
Contributor

/retest

@eslutsky

Copy link
Copy Markdown
Contributor Author

/override ci/prow/e2e-aws-tests
/override ci/prow/e2e-aws-tests-arm
/override ci/prow/e2e-aws-tests-bootc-el10
/override ci/prow/e2e-aws-tests-bootc-arm-el9
/override ci/prow/e2e-aws-tests-bootc-el9
/override ci/prow/e2e-aws-tests-bootc-arm-el10
overriding to satisfy source-base during build time requirements .

@openshift-ci

openshift-ci Bot commented Aug 27, 2026

Copy link
Copy Markdown
Contributor

@eslutsky: Overrode contexts on behalf of eslutsky: ci/prow/e2e-aws-tests, ci/prow/e2e-aws-tests-arm, ci/prow/e2e-aws-tests-bootc-arm-el10, ci/prow/e2e-aws-tests-bootc-arm-el9, ci/prow/e2e-aws-tests-bootc-el10, ci/prow/e2e-aws-tests-bootc-el9

Details

In response to this:

/override ci/prow/e2e-aws-tests
/override ci/prow/e2e-aws-tests-arm
/override ci/prow/e2e-aws-tests-bootc-el10
/override ci/prow/e2e-aws-tests-bootc-arm-el9
/override ci/prow/e2e-aws-tests-bootc-el9
/override ci/prow/e2e-aws-tests-bootc-arm-el10
overriding to satisfy source-base during build time requirements .

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.

@pacevedom pacevedom left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

/lgtm

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

openshift-ci Bot commented Aug 27, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: eslutsky, pacevedom

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

@eslutsky

Copy link
Copy Markdown
Contributor Author

/verified by CI

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Aug 27, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@eslutsky: This PR has been marked as verified by CI.

Details

In response to this:

/verified by CI

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.

@eslutsky eslutsky added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. labels Aug 27, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD 37f88c5 and 2 for PR HEAD 89973a3 in total

@openshift-ci-robot openshift-ci-robot removed the verified Signifies that the PR passed pre-merge verification criteria label Aug 27, 2026
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 27, 2026
@openshift-ci

openshift-ci Bot commented Aug 27, 2026

Copy link
Copy Markdown
Contributor

New changes are detected. LGTM label has been removed.

@coderabbitai coderabbitai Bot added the ready-for-human-review Indicates a PR has been reviewed by automated tools and is ready for human review label Aug 27, 2026
@openshift-ci-robot

openshift-ci-robot commented Aug 27, 2026

Copy link
Copy Markdown

@eslutsky: This pull request references USHIFT-7487 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 bug to target the "5.1.0" version, but no target version was set.

Retaining the jira/valid-bug label as it was manually added.

Details

In response to this:

Summary

  • Update CRI-O version requirement from >= 1.36.0, < 1.37.0 to >= 5.1.0, < 5.2.0 in the RPM spec to match the OCP 5.1 dependency repo
  • cri-tools stays at 1.36.0 as that is the version shipped in the 5.1-el9-beta repo

Test plan

  • Verify RPM builds successfully with the updated dependency
  • Verify MicroShift installs with cri-o-5.1.0 from the 5.1 repo

🤖 Generated with Claude Code

Summary by CodeRabbit

  • Bug Fixes
  • Updated the MicroShift RPM package to require a compatible CRI-O version in the 5.1.x release range.
  • Updated beta dependency references to use the 5.1 repository path.

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.

Run generate_common_versions.py 5.1 to update version
variables after the 5.0 -> 5.1 OCP_VERSION bump.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Aug 27, 2026

Copy link
Copy Markdown
Contributor

Note

GitHub couldn't provide a complete incremental comparison for this pull request, so CodeRabbit is performing a full review instead. This review may take a little longer.

@coderabbitai coderabbitai Bot removed the ready-for-human-review Indicates a PR has been reviewed by automated tools and is ready for human review label Aug 27, 2026
@openshift-ci

openshift-ci Bot commented Aug 27, 2026

Copy link
Copy Markdown
Contributor

@eslutsky: The following tests 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-tests-bootc-el9 c85b782 link true /test e2e-aws-tests-bootc-el9
ci/prow/e2e-aws-tests-periodic-arm c85b782 link true /test e2e-aws-tests-periodic-arm
ci/prow/e2e-aws-tests-periodic c85b782 link true /test e2e-aws-tests-periodic
ci/prow/e2e-aws-tests-arm c85b782 link true /test e2e-aws-tests-arm
ci/prow/e2e-aws-tests c85b782 link true /test e2e-aws-tests
ci/prow/e2e-aws-tests-bootc-periodic-el9 c85b782 link true /test e2e-aws-tests-bootc-periodic-el9
ci/prow/e2e-aws-tests-bootc-el10 c85b782 link true /test e2e-aws-tests-bootc-el10
ci/prow/e2e-aws-tests-bootc-periodic-el10 c85b782 link true /test e2e-aws-tests-bootc-periodic-el10
ci/prow/e2e-aws-tests-bootc-arm-el9 c85b782 link true /test e2e-aws-tests-bootc-arm-el9
ci/prow/e2e-aws-tests-bootc-arm-el10 c85b782 link true /test e2e-aws-tests-bootc-arm-el10
ci/prow/e2e-aws-tests-bootc-periodic-arm-el9 c85b782 link true /test e2e-aws-tests-bootc-periodic-arm-el9
ci/prow/e2e-aws-tests-bootc-periodic-arm-el10 c85b782 link true /test e2e-aws-tests-bootc-periodic-arm-el10

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. 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.

3 participants