From 7b617ce25c71288883facc67f25dbf836246fd54 Mon Sep 17 00:00:00 2001 From: Alejandro Gullon Date: Thu, 23 Apr 2026 17:12:09 +0200 Subject: [PATCH] USHIFT-6886: Comment out tuned boot-wait in ginkgo-multi-config scenario 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 pre-commit.check-secrets: ENABLED --- .../releases/el98-lrel@ginkgo-multi-config.sh | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/test/scenarios/releases/el98-lrel@ginkgo-multi-config.sh b/test/scenarios/releases/el98-lrel@ginkgo-multi-config.sh index b211a13d5c..3571c9c943 100644 --- a/test/scenarios/releases/el98-lrel@ginkgo-multi-config.sh +++ b/test/scenarios/releases/el98-lrel@ginkgo-multi-config.sh @@ -48,20 +48,22 @@ scenario_remove_vms() { scenario_run_tests() { exit_if_commit_not_found "${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 + # 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 # Apply TLSv1.3 configuration via drop-in config echo "INFO: Configuring TLSv1.3..."