USHIFT-6519: Switch to using RHEL 9.8 in bootc presubmits and periodics#6202
USHIFT-6519: Switch to using RHEL 9.8 in bootc presubmits and periodics#6202ggiguash wants to merge 13 commits intoopenshift:mainfrom
Conversation
openshift-ci-robot
added
the
jira/valid-reference
openshift-ci
bot
added
the
do-not-merge/work-in-progress
|
@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. DetailsIn 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. |
|
Skipping CI for Draft Pull Request. |
|
@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. DetailsIn 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. |
|
/test ? |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ggiguash The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
|
/test e2e-aws-tests-bootc |
|
/test e2e-aws-tests-bootc |
ggiguash
force-pushed
the
rhel98-presubmits-bootc
branch
from
9a26b8c to
01cab47
Compare
|
/test e2e-aws-tests-bootc |
ggiguash
force-pushed
the
rhel98-presubmits-bootc
branch
from
7ffcdda to
4f4e0b4
Compare
|
/test e2e-aws-tests-bootc |
|
/test e2e-aws-tests-bootc |
|
Important Review skippedDraft detected. Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the Use the checkbox below for a quick retry:
📝 WalkthroughWalkthroughAdds local test Makefile targets and a find_layer macro; shifts webserver start log timing; updates many bootc containerfiles, image tags, and presubmit scenario scripts from RHEL 9.6 → 9.8; adds a rhel98 mirror repo stanza. Changes
Sequence Diagram(s)sequenceDiagram
participant Dev as Developer
participant Make as Makefile (test/Makefile)
participant Comp as Composer config
participant Hyper as Hypervisor config
participant Reg as Local Registry / OSTree
participant Cache as Cache downloader
Dev->>Make: invoke test-build-ostree-presubmit (ARGS...)
Make->>Comp: test-config-composer (generate config)
Make->>Hyper: test-config-hypervisor (prepare VM blueprint)
Make->>Cache: test-cache-download (fetch layers)
Make->>Reg: test-build-registry-clean (ensure clean registry)
Make->>Reg: build ostree / bootc images (push tags)
Reg->>Make: return image refs
Make->>Dev: report build results
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes 🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
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. Comment |
|
/test e2e-aws-tests-bootc |
|
@coderabbitai perform full review |
|
✅ Actions performedFull review triggered. |
|
@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. DetailsIn 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. |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 Fix all issues with AI agents
In `@test/Makefile`:
- Around line 76-79: The Makefile declares PHONY: instead of the special .PHONY:
so the target test-build-ostree-presubmit is not marked as phony; change the
target declaration from PHONY to .PHONY and include test-build-ostree-presubmit
in that .PHONY list so Make treats test-build-ostree-presubmit as a phony target
rather than a real file.
In `@test/scenarios-bootc/presubmits/el96-prel`@el98-src@upgrade-ok.sh:
- Line 11: The boot blueprint is incorrect: the launch_vm call currently uses
--boot_blueprint rhel98-bootc but the scenario is el96-prel@el98-src and must
use the rhel96 boot blueprint; update the launch_vm invocation to use
--boot_blueprint rhel96-bootc (matching the start image) so the boot blueprint
aligns with the start image for the el96-prel scenario.
🧹 Nitpick comments (2)
test/Makefile (2)
63-65:find_layermay return multiple or zero matches silently.If no directory matches (e.g., typo in token), the build command will run with an empty
-largument and fail with a confusing error. Consider adding a guard or using$(or $(call find_layer,...),$(error ...)).
52-58: Double-space typo on line 57.There's an extra leading space/tab before
./bin/manage_build_cache.sh(the⟶on line 57 shows\trather than just\t). In abash -cheredoc this is harmless, but it looks unintentional.
test/scenarios-bootc/presubmits/el96-prel@el98-src@upgrade-ok.sh
Outdated
Show resolved
Hide resolved
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
|
/test all |
|
@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. DetailsIn 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. |
There was a problem hiding this comment.
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/Makefile`:
- Around line 63-65: The find_layer function silently returns empty or
multi-line values causing bad -l args; change its implementation (symbol:
find_layer) to validate the number of matches and fail loudly: run a shell
snippet that finds matching directories, splits by newline, counts them, and if
count != 1 prints a single canonical path to stdout but otherwise invokes make
error (or exits non‑zero) with a clear message; ensure consuming targets (e.g.
test-build-ostree-* and test-build-bootc-*) receive exactly one safe path or the
Makefile stops with an error.
|
@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. DetailsIn 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. |
openshift-ci
bot
added
the
do-not-merge/work-in-progress
|
/test ? |
|
/test e2e-aws-tests-cache |
|
@ggiguash: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. |
2 participants
Also addresses USHIFT-6521
Summary by CodeRabbit