Skip to content

Commit

Permalink
Merge pull request os-autoinst#20230 from jlausuch/slm_skip_boot_needle
Browse files Browse the repository at this point in the history
Enhance disk_boot for SLMicro
  • Loading branch information
jlausuch authored Sep 19, 2024
2 parents 9ba710f + 8243b68 commit 9b2a1df
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion tests/microos/disk_boot.pm
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ sub run {
# default timeout in grub2 is set to 10s
# Sometimes, machines tend to stall when trying to match grub2
# this leads to test failures because openQA does not assert grub2 properly
if ((is_aarch64 || is_sle_micro('>=6.0')) && !main_micro_alp::is_dvd()) {
# KEEP_GRUB_TIMEOUT=0 will force the grub needle to match, useful when booting
# pre-configured images with disabled timeout. See opensusebasetest::handle_grub
if ((is_aarch64 || is_sle_micro('>=6.0')) && get_var('KEEP_GRUB_TIMEOUT', '1') && !main_micro_alp::is_dvd()) {
shift->wait_boot_past_bootloader(textmode => 1);
} else {
shift->wait_boot(bootloader_time => 300);
Expand Down

0 comments on commit 9b2a1df

Please sign in to comment.