Skip to content

USHIFT-6519: RHEL 9.8 in bootc presubmits and periodics - remaining fixes#6270

Merged
openshift-merge-bot[bot] merged 6 commits intoopenshift:mainfrom
ggiguash:rhel98-release-bootc
Feb 24, 2026
Merged

USHIFT-6519: RHEL 9.8 in bootc presubmits and periodics - remaining fixes#6270
openshift-merge-bot[bot] merged 6 commits intoopenshift:mainfrom
ggiguash:rhel98-release-bootc

Conversation

@ggiguash
Copy link
Contributor

@ggiguash ggiguash commented Feb 24, 2026

Fixing aftermath of #6202

Also addresses USHIFT-6521

Note: Implemented a temporary workaround for the greenboot behavior change by disabling some scenarios. The fix will be done in USHIFT-6636

Summary by CodeRabbit

  • Chores

    • Relaxed container runtime dependency constraints for cri-o and cri-tools in packaging.
  • Tests

    • Updated upgrade/boot tests to target the newer base release.
    • Enhanced upgrade failure/rollback test by adding a "next deployment" action and removing the fixed boot-count assertion in favor of action-driven sequencing.

@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 24, 2026
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 24, 2026
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 24, 2026

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-robot
Copy link

openshift-ci-robot commented Feb 24, 2026

@ggiguash: This pull request references USHIFT-6519 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 story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Fixing aftermath of #6202

Also addresses USHIFT-6521

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

coderabbitai bot commented Feb 24, 2026

📝 Walkthrough

Walkthrough

Relaxed RPM Requires ranges for cri-o and cri-tools; boot-source references in two upgrade test scripts changed from RHEL96 to RHEL98; rollback test added a TestAgent.Add action for "next deployment" and removed the fixed "Expected Boot Count 5" assertion.

Changes

Cohort / File(s) Summary
RPM Spec Version Constraints
packaging/rpm/microshift.spec
Relaxed RPM Requires ranges: cri-o and cri-tools constraints updated to broader bounds; added comments about the transition period.
Upgrade Bootc Test Scripts
test/scenarios-bootc/presubmits/el96-yminus2@el98-src@upgrade-ok.sh, test/scenarios-bootc/presubmits/el96-yminus2@prel@src@delta-upgrade-ok.sh
Switched boot-source references from rhel96-bootc-source to rhel98-bootc-source in target/prep/apply steps and loop references.
Rollback Test (Robot)
test/suites/upgrade/upgrade-fails-and-rolls-back.robot
Inserted TestAgent.Add Action For Next Deployment every ${REASON} and removed the explicit Expected Boot Count 5 assertion.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check name Status Explanation
Title check ✅ Passed The title directly references the main objective: updating RHEL 9.8 in bootc presubmits and periodics with remaining fixes, matching all four file changes.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.

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

✨ Finishing Touches
  • 📝 Generate docstrings (stacked PR)
  • 📝 Generate docstrings (commit on current branch)
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment

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

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

@ggiguash
Copy link
Contributor Author

/test ?

@ggiguash
Copy link
Contributor Author

/test e2e-aws-tests-bootc
/test e2e-aws-tests-bootc-arm
/test e2e-aws-tests-bootc-periodic
/test e2e-aws-tests-bootc-periodic-arm

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 24, 2026
@ggiguash
Copy link
Contributor Author

/test e2e-aws-tests-bootc
/test e2e-aws-tests-bootc-arm
/test e2e-aws-tests-bootc-periodic
/test e2e-aws-tests-bootc-periodic-arm

@ggiguash ggiguash marked this pull request as ready for review February 24, 2026 08:23
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 24, 2026
@openshift-ci openshift-ci bot requested review from agullon and jogeo February 24, 2026 08:29
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 24, 2026

@ggiguash: This pull request references USHIFT-6519 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 story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Fixing aftermath of #6202

Also addresses USHIFT-6521

Summary by CodeRabbit

  • Chores
  • Updated container runtime dependency constraints for cri-o and cri-tools in package configuration.
  • Improved upgrade test validation logic for failure and rollback scenarios.

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.

Copy link

@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

🧹 Nitpick comments (1)
test/scenarios-bootc/presubmits/el96-yminus2@prel@src@delta-upgrade-ok.sh (1)

18-21: Consider renaming the file to reflect el98-src.

The src segment in the filename is now ambiguously unversioned — rhel98-bootc-source is the target. A related file in this same PR uses el98-src explicitly (el96-yminus2@el98-src@upgrade-ok.sh). Renaming to el96-yminus2@prel@el98-src@delta-upgrade-ok.sh would align the naming convention.

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@test/scenarios-bootc/presubmits/el96-yminus2`@prel@src@delta-upgrade-ok.sh
around lines 18 - 21, Rename the test file currently named
"el96-yminus2@prel@src@delta-upgrade-ok.sh" to explicitly reference the target
source version; update it to "el96-yminus2@prel@el98-src@delta-upgrade-ok.sh" so
the filename aligns with the existing companion
"el96-yminus2@el98-src@upgrade-ok.sh" and removes ambiguity of the "src"
segment.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@packaging/rpm/microshift.spec`:
- Around line 67-70: Replace the TODO about cri-tools with a strict version
constraint and a release gate reference: update the RPM spec requirement for
cri-tools (the entry that currently references the TODO) to require cri-tools >=
1.35.0 (matching CRI-O 1.35.x) and add a short comment pointing to the release
policy/Jira ticket that enforces this gate so the relaxed constraint cannot be
shipped accidentally; ensure the change touches the spec "Requires:"/package
dependency line that currently contains the TODO and add the Jira ID or
release-gate marker in that same comment.

---

Nitpick comments:
In `@test/scenarios-bootc/presubmits/el96-yminus2`@prel@src@delta-upgrade-ok.sh:
- Around line 18-21: Rename the test file currently named
"el96-yminus2@prel@src@delta-upgrade-ok.sh" to explicitly reference the target
source version; update it to "el96-yminus2@prel@el98-src@delta-upgrade-ok.sh" so
the filename aligns with the existing companion
"el96-yminus2@el98-src@upgrade-ok.sh" and removes ambiguity of the "src"
segment.

ℹ️ Review info

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Cache: Disabled due to data retention organization setting

Knowledge base: Disabled due to data retention organization setting

📥 Commits

Reviewing files that changed from the base of the PR and between 1381b42 and 5668991.

📒 Files selected for processing (4)
  • packaging/rpm/microshift.spec
  • test/scenarios-bootc/presubmits/el96-yminus2@el98-src@upgrade-ok.sh
  • test/scenarios-bootc/presubmits/el96-yminus2@prel@src@delta-upgrade-ok.sh
  • test/suites/upgrade/upgrade-fails-and-rolls-back.robot

@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 24, 2026

@ggiguash: This pull request references USHIFT-6519 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 story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Fixing aftermath of #6202

Also addresses USHIFT-6521

Summary by CodeRabbit

  • Chores

  • Relaxed container runtime dependency constraints for cri-o and cri-tools in packaging.

  • Tests

  • Updated upgrade/boot test targets to the newer base release.

  • Improved upgrade failure/rollback test to use a dynamic reboot-count check instead of a fixed expectation.

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.

@ggiguash
Copy link
Contributor Author

/test e2e-aws-tests-bootc-periodic
/test e2e-aws-tests-bootc-periodic-arm

@ggiguash ggiguash force-pushed the rhel98-release-bootc branch from d6c1548 to 58c7d20 Compare February 24, 2026 13:17
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 24, 2026

@ggiguash: This pull request references USHIFT-6519 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 story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Fixing aftermath of #6202

Also addresses USHIFT-6521

Summary by CodeRabbit

  • Chores

  • Relaxed container runtime dependency constraints for cri-o and cri-tools in packaging.

  • Tests

  • Updated upgrade/boot tests to target the newer base release.

  • Enhanced upgrade failure/rollback test by adding a "next deployment" action and removing the fixed boot-count assertion in favor of action-driven sequencing.

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.

@ggiguash
Copy link
Contributor Author

/test e2e-aws-tests-bootc-periodic
/test e2e-aws-tests-bootc-periodic-arm

Copy link

@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/suites/upgrade/upgrade-fails-and-rolls-back.robot`:
- Around line 38-40: The test lost reboot-count validation after rollback:
update the rollback flow (the Deploy Commit Expecting A Rollback keyword in
ostree.resource around the Deploy Commit Expecting A Rollback implementation) to
assert the system boot count by calling the Expected Boot Count keyword once
rollback completes, or if intended, add a comment and cross-check that another
mechanism verifies reboot counts; ensure you reference the Deploy Commit
Expecting A Rollback keyword and add an explicit Expected Boot Count invocation
immediately after the rollback completion path so the test revalidates the
reboot count.

ℹ️ Review info

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Cache: Disabled due to data retention organization setting

Knowledge base: Disabled due to data retention organization setting

📥 Commits

Reviewing files that changed from the base of the PR and between d6c1548 and 58c7d20.

📒 Files selected for processing (1)
  • test/suites/upgrade/upgrade-fails-and-rolls-back.robot

@ggiguash
Copy link
Contributor Author

/test e2e-aws-tests-bootc-periodic
/test e2e-aws-tests-bootc-periodic-arm
/test e2e-aws-tests-periodic
/test e2e-aws-tests-periodic-arm

@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 24, 2026

@ggiguash: This pull request references USHIFT-6519 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 story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Fixing aftermath of #6202

Also addresses USHIFT-6521

Note: Implemented a temporary workaround for the greenboot behavior change by disabling some scenarios. The fix will be done in USHIFT-6636

Summary by CodeRabbit

  • Chores

  • Relaxed container runtime dependency constraints for cri-o and cri-tools in packaging.

  • Tests

  • Updated upgrade/boot tests to target the newer base release.

  • Enhanced upgrade failure/rollback test by adding a "next deployment" action and removing the fixed boot-count assertion in favor of action-driven sequencing.

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.

@ggiguash
Copy link
Contributor Author

The failures are flakes. Overriding to save on CI cycles.
/override ci/prow/e2e-aws-tests ci/prow/e2e-aws-tests-bootc ci/prow/e2e-aws-tests-bootc-periodic
/verified by ci

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

@ggiguash: This PR has been marked as verified by ci.

Details

In response to this:

The failures are flakes. Overriding to save on CI cycles.
/override ci/prow/e2e-aws-tests ci/prow/e2e-aws-tests-bootc ci/prow/e2e-aws-tests-bootc-periodic
/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.

@copejon
Copy link
Contributor

copejon commented Feb 24, 2026

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 24, 2026
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 24, 2026

@ggiguash: Overrode contexts on behalf of ggiguash: ci/prow/e2e-aws-tests, ci/prow/e2e-aws-tests-bootc, ci/prow/e2e-aws-tests-bootc-periodic

Details

In response to this:

The failures are flakes. Overriding to save on CI cycles.
/override ci/prow/e2e-aws-tests ci/prow/e2e-aws-tests-bootc ci/prow/e2e-aws-tests-bootc-periodic
/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 kubernetes-sigs/prow repository.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 24, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: copejon, ggiguash

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

openshift-ci bot commented Feb 24, 2026

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

@openshift-merge-bot openshift-merge-bot bot merged commit cf6c19e into openshift:main Feb 24, 2026
16 checks passed
@ggiguash ggiguash deleted the rhel98-release-bootc branch February 24, 2026 17:04
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.

3 participants