add a softfail workaround for RHBZ #1349721

Summary:
try to catch a boot loop after `dnf system-upgrade reboot`, if
we do, set the test to soft_fail and pass enforcing=0 to work
around it.

Test Plan:
Run the upgrade_foo tests and see that they now soft
fail instead of hard failing (unless there are any other issues).
Run the upgrade_2_foo tests and make sure they still pass (i.e.
we don't erroneously soft fail them).

Reviewers: garretraziel

Reviewed By: garretraziel

Subscribers: tflink

Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D912
This commit is contained in:
Adam Williamson 2016-07-01 08:16:47 -07:00
parent b475c15c76
commit 29c3fab71e

View File

@ -24,6 +24,15 @@ sub run {
script_run "dnf system-upgrade reboot"; script_run "dnf system-upgrade reboot";
# fail immediately if we see a DNF error message # fail immediately if we see a DNF error message
die "DNF reported failure" if (check_screen "upgrade_fail"); die "DNF reported failure" if (check_screen "upgrade_fail");
# try and catch if we hit RHBZ #1349721 and work around it
if (check_screen "bootloader") {
# wait some secs for the screen to clear
sleep 10;
if (check_screen "bootloader") {
record_soft_failure;
$self->do_bootloader(postinstall=>1, params=>"enforcing=0");
}
}
} }