USHIFT-6886: Comment out tuned boot-wait in ginkgo-multi-config scenario#6570
Conversation
The el98-lrel@ginkgo-multi-config scenario uses start_image=rhel98-brew-lrel-optional which does not have microshift-tuned enabled or configured. The boot-wait loop expecting a tuned-triggered reboot will always time out since the tuned image blueprint is disabled due to kernel-rt unavailability on RHEL 9.8. Comment out the boot-wait block until the tuned image is re-enabled. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> pre-commit.check-secrets: ENABLED
openshift-ci-robot
added
the
jira/valid-reference
|
@agullon: This pull request references USHIFT-6886 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.0.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. |
WalkthroughA test scenario's pre-test readiness logic was modified to skip boot-count polling verification. The 60-second polling loop is now commented out with a TODO note, allowing the test flow to proceed directly to TLSv1.3 configuration and MicroShift preparation. Changes
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes 🚥 Pre-merge checks | ✅ 11 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (11 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
openshift-ci
Bot
added
the
approved
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
🧹 Nitpick comments (1)
test/scenarios/releases/el98-lrel@ginkgo-multi-config.sh (1)
51-66: Prefer conditional gating over commented-out logic.This change is valid for the current image, but preserving the full loop as comments is brittle. Gate the wait by
start_image(or a dedicated flag) so re-enable is automatic when tuned images return.Suggested refactor
- # TODO: Re-enable once kernel-rt is available for RHEL 9.8 and the - # rhel98-brew-lrel-tuned image is used as start_image. - # # Wait for microshift-tuned to reboot the node - # local -r start_time=$(date +%s) - # while true; do - # boot_num=$(run_command_on_vm host1 "sudo journalctl --list-boots --quiet | wc -l" || true) - # boot_num="${boot_num%$'\r'*}" - # if [[ "${boot_num}" -ge 2 ]]; then - # break - # fi - # if [ $(( $(date +%s) - start_time )) -gt 60 ]; then - # echo "Timed out waiting for VM having 2 boots" - # exit 1 - # fi - # sleep 5 - # done + if [[ "${start_image}" == *"-tuned" ]]; then + # Wait for microshift-tuned to reboot the node. + local -r start_time=$(date +%s) + while true; do + local boot_num + boot_num=$(run_command_on_vm host1 "sudo journalctl --list-boots --quiet | wc -l" || true) + boot_num="${boot_num%$'\r'*}" + [[ "${boot_num}" -ge 2 ]] && break + if [ $(( $(date +%s) - start_time )) -gt 60 ]; then + echo "Timed out waiting for VM having 2 boots" + exit 1 + fi + sleep 5 + done + else + echo "INFO: Skipping tuned reboot wait for start_image=${start_image}" + fi🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@test/scenarios/releases/el98-lrel`@ginkgo-multi-config.sh around lines 51 - 66, Replace the commented-out reboot-wait loop with a conditional guard so the logic runs automatically for the tuned image instead of being left as comments; specifically, restore the loop that checks boot count via run_command_on_vm and the timeout logic but wrap it in a conditional on start_image (e.g. test for "rhel98-brew-lrel-tuned") or a new boolean flag (e.g. WAIT_FOR_TUNED_REBOOT) and execute the loop only when that condition is true; keep the loop body and timeout behavior intact and remove the commented block.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Nitpick comments:
In `@test/scenarios/releases/el98-lrel`@ginkgo-multi-config.sh:
- Around line 51-66: Replace the commented-out reboot-wait loop with a
conditional guard so the logic runs automatically for the tuned image instead of
being left as comments; specifically, restore the loop that checks boot count
via run_command_on_vm and the timeout logic but wrap it in a conditional on
start_image (e.g. test for "rhel98-brew-lrel-tuned") or a new boolean flag (e.g.
WAIT_FOR_TUNED_REBOOT) and execute the loop only when that condition is true;
keep the loop body and timeout behavior intact and remove the commented block.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Pro Plus
Run ID: 73493424-a1af-4119-8b08-cc41789d1c8a
📒 Files selected for processing (1)
test/scenarios/releases/el98-lrel@ginkgo-multi-config.sh
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: agullon, 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 |
|
/retest |
|
/verified by CI |
openshift-ci-robot
added
the
verified
|
@agullon: This PR has been marked as verified by 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. |
|
/cherrypick release-4.22 |
|
@agullon: once the present PR merges, I will cherry-pick it on top of 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 kubernetes-sigs/prow repository. |
|
/retest |
|
@agullon: all tests passed! 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. |
|
@agullon: new pull request created: #6577 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 kubernetes-sigs/prow repository. |
4 participants
Summary
el98-lrel@ginkgo-multi-configthat expects amicroshift-tunedrebootstart_image=rhel98-brew-lrel-optionalwhich has no tuned configuration, so the reboot never happens and the 60s timeout always fireskernel-rtis unavailable on RHEL 9.8Test plan
el98-lrel@ginkgo-multi-configscenario passes in periodic CI (no longer times out waiting for 2 boots)🤖 Generated with Claude Code
Summary by CodeRabbit