USHIFT-6519: Switch to using RHEL 9.8 in bootc presubmits and periodics #6202
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 |
📝 WalkthroughWalkthroughThis pull request adds local testing framework targets to test/Makefile, exports the WEB_SERVER_PORT environment variable, enables host networking for Podman commands, updates repository mirror configuration to use localhost, and migrates test scenarios and container base images from RHEL 9.6 (rhel96) to RHEL 9.8 (rhel98). Changes
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~25 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.
| PHONY: test-build-ostree-presubmit | ||
| test-build-ostree-presubmit: | ||
| ./bin/build_images.sh -l $(call find_layer,image-blueprints,base) $(ARGS) | ||
| ./bin/build_images.sh -l $(call find_layer,image-blueprints,presubmit) $(ARGS) |
There was a problem hiding this comment.
Missing . prefix: PHONY should be .PHONY.
Line 76 declares PHONY: instead of .PHONY:, so test-build-ostree-presubmit won't actually be marked as phony. Make will treat PHONY as a real target.
Proposed fix
-PHONY: test-build-ostree-presubmit
+.PHONY: test-build-ostree-presubmit🧰 Tools
🪛 checkmake (0.2.2)
[warning] 76-76: Target "PHONY" should be declared PHONY.
(phonydeclared)
🤖 Prompt for AI Agents
In `@test/Makefile` around lines 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.
|
|
||
| prepare_kickstart host1 kickstart-bootc.ks.template "${start_image}" | ||
| launch_vm --boot_blueprint rhel96-bootc | ||
| launch_vm --boot_blueprint rhel98-bootc |
There was a problem hiding this comment.
🧩 Analysis chain
🏁 Script executed:
#!/bin/bash
# Check boot_blueprint and start_image patterns in scenario files
echo "=== Checking el9X@elYY upgrade scenarios ==="
fd -e sh test/scenarios-bootc/presubmits/ | grep '@' | while read file; do
echo "--- $file ---"
grep -E '(start_image|boot_blueprint)' "$file" | head -6
doneRepository: openshift/microshift
Length of output: 559
🏁 Script executed:
#!/bin/bash
# Fix: use correct fd syntax
echo "=== Checking upgrade scenarios (el9X@elYY pattern) ==="
fd '@' test/scenarios-bootc/presubmits/ --type f | while read file; do
echo "--- $(basename "$file") ---"
grep -E '(start_image|boot_blueprint)' "$file" | grep -v '^#'
echo
doneRepository: openshift/microshift
Length of output: 2766
Change boot blueprint back to rhel96-bootc.
The boot blueprint should match the start image version. All other upgrade scenarios follow this pattern: el96-prel@el100-src uses rhel96-bootc, el98-src@el100-src uses rhel98-bootc. This file incorrectly pairs rhel96-bootc-prel (start) with rhel98-bootc (boot).
🤖 Prompt for AI Agents
In `@test/scenarios-bootc/presubmits/el96-prel`@el98-src@upgrade-ok.sh at 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.
|
@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
Release Notes
Tests
Chores