srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-21 21:43:08 +00:00
Code Issues Releases Activity

Fix #2268505 workaround - move the actions push earlier

Browse Source 
Oops, all other actions pushes need to happen *before* the reboot
action push, or the logic breaks.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2024-03-26 08:29:25 -07:00
parent 1739f38061
commit f1c23be409
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/_do_install_and_reboot.pm
View File

@ -125,6 +125,9 @@ sub run {
push(@actions, 'noplymouth'); push(@actions, 'noplymouth');
} }
} }
if (get_var("CANNED") && get_var("UEFI")) {
push(@actions, 'checkefibootmgr') if (get_var("UEFI"));
}
# memcheck test doesn't need to reboot at all. Rebooting from GUI # memcheck test doesn't need to reboot at all. Rebooting from GUI
# for no-webUI lives is unreliable (webUI lives reboot on "Quit" # for no-webUI lives is unreliable (webUI lives reboot on "Quit"
# just like non-lives). And if we're already doing something # just like non-lives). And if we're already doing something
@ -133,9 +136,6 @@ sub run {
# check whether install is affected by # check whether install is affected by
# https://bugzilla.redhat.com/show_bug.cgi?id=2268505 , # https://bugzilla.redhat.com/show_bug.cgi?id=2268505 ,
# soft fail and work around it if so # soft fail and work around it if so
if (get_var("CANNED") && get_var("UEFI")) {
push(@actions, 'checkefibootmgr') if (get_var("UEFI"));
}
# our approach for taking all these actions doesn't work on VNC # our approach for taking all these actions doesn't work on VNC
# installs, fortunately we don't need any of them in that case # installs, fortunately we don't need any of them in that case
# yet, so for now let's just flush the list here if we're VNC # yet, so for now let's just flush the list here if we're VNC