testing/os-autoinst-distri-rocky
11
0
Fork 0
mirror of https://github.com/rocky-linux/os-autoinst-distri-rocky.git synced 2024-12-22 10:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add the #1674045 workaround to one more place

Browse Source 
Sigh, so much copypasta makes me sad, should've factored it out.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2019-03-05 07:35:11 -08:00
parent 86fe913b84
commit 0c63065ebd
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/utils.pm
View File

@ -238,7 +238,19 @@ sub do_bootloader {
# sure we actually did a UEFI boot
my $boottag = "bootloader_bios";
$boottag = "bootloader_uefi" if ($args{uefi});
assert_screen $boottag, $args{timeout};
assert_screen [$boottag, "upgrade_complete"], $args{timeout};
if (match_has_tag "upgrade_complete") {
# this is a workaround for RHBZ #1674045 during upgrades
# let's check we didn't just happen to catch it for the
# brief time it's displayed normally...
sleep 10;
if (check_screen "upgrade_complete") {
record_soft_failure "Upgrade hung at end - probably RHBZ #1674045";
power 'reset';
}
# now let's just assume we'll get to the bootloader soon
assert_screen $boottag, 60;
}
if ($args{mutex}) {
# cancel countdown
send_key "left";