From 80d765cd26a4c80efbdbbea67477e237af8eaf8c 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 and leap<16.0 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/main_common.pm b/lib/main_common.pm index 5a3e2c240171..540e02d739ef 100644 --- a/lib/main_common.pm +++ b/lib/main_common.pm @@ -1100,8 +1100,8 @@ sub load_inst_tests { loadtest "installation/resolve_dependency_issues" unless (get_var("DEPENDENCY_RESOLVER_FLAG") || get_var('KERNEL_64KB_PAGE_SIZE')); 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'); + # SELinux relabel reboots on SLE <16 and Leap <16.0, so grub needs to timeout + set_var('KEEP_GRUB_TIMEOUT', 1) if check_var('VIRSH_VMM_TYPE', 'linux') || (get_var('SELINUX') && (is_sle('<16') || is_leap('<16.0'))); loadtest "installation/disable_grub_timeout" unless get_var('KEEP_GRUB_TIMEOUT'); if (check_var('VIDEOMODE', 'text') && is_ipmi) { loadtest "installation/disable_grub_graphics";