From 29c3fab71eb244cbccd5563414aa62f5e3bbd50f Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 1 Jul 2016 08:16:47 -0700 Subject: [PATCH] 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 --- tests/upgrade_run.pm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/upgrade_run.pm b/tests/upgrade_run.pm index def1378c..7ac0b3cf 100644 --- a/tests/upgrade_run.pm +++ b/tests/upgrade_run.pm @@ -24,6 +24,15 @@ sub run { script_run "dnf system-upgrade reboot"; # fail immediately if we see a DNF error message 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"); + } + } }