Skip to content

Commit

Permalink
Only keep grub timeout for SELINUX tests for sle<16 and leap<16.0
Browse files Browse the repository at this point in the history
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:
openSUSE/microos-tools#33
  • Loading branch information
ca-hu committed Nov 26, 2024
1 parent 2d21259 commit 80d765c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/main_common.pm
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down

0 comments on commit 80d765c

Please sign in to comment.