From 252bdbb1152a10c4f4815bd05a2953206e2a8dd1 Mon Sep 17 00:00:00 2001 From: Cathy Hu Date: Mon, 30 Sep 2024 09:59:24 +0200 Subject: [PATCH] Only keep grub timeout for SELINUX tests for sle<16 The relabelling mechanism in the selinux-autorelabel package will be fixed to not reboot, thus not needing the grub timeout to boot for the tests to work. see: https://github.com/openSUSE/microos-tools/pull/33 --- lib/main_common.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/main_common.pm b/lib/main_common.pm index db15d4e2239e..1cd048eb5789 100644 --- a/lib/main_common.pm +++ b/lib/main_common.pm @@ -1101,7 +1101,7 @@ sub load_inst_tests { loadtest "installation/installation_overview"; # On Xen PV we don't have GRUB on VNC # SELinux relabel reboots, so grub needs to timeout - set_var('KEEP_GRUB_TIMEOUT', 1) if check_var('VIRSH_VMM_TYPE', 'linux') || get_var('SELINUX'); + set_var('KEEP_GRUB_TIMEOUT', 1) if check_var('VIRSH_VMM_TYPE', 'linux') || (get_var('SELINUX') && is_sle('<16')); loadtest "installation/disable_grub_timeout" unless get_var('KEEP_GRUB_TIMEOUT'); if (check_var('VIDEOMODE', 'text') && is_ipmi) { loadtest "installation/disable_grub_graphics";