From 86b354ad63ac0bd8c80f800cb969420a7b5e8bee Mon Sep 17 00:00:00 2001 From: Michel Normand Date: Fri, 25 Sep 2020 08:20:16 +0200 Subject: [PATCH] Revert 2 commits brc#1817004 for ppc64le Silverblue to boot Revert "Regenerate grub.cfg for ppc64le Silverblue to boot (step 2)" This reverts commit d384cfed307567ef0353a01dabdf5e45ff4cf900. Revert "Regenerate grub.cfg for ppc64le Silverblue to boot, brc#1817004" This reverts commit 8d7be9a227705820088fdea1958e662042738412. Not required anymore for f33 (only for f32) And bad side effect for f33 (failure not analysed) eg: https://openqa.stg.fedoraproject.org/tests/949783#step/_do_install_and_reboot/32 Keep correction to avoid warning in autoinst-log when ABRT var not defined. Signed-off-by: Guy Menanteau Signed-off-by: Michel Normand --- tests/_do_install_and_reboot.pm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm index 3cbbcdd5..83d307c9 100644 --- a/tests/_do_install_and_reboot.pm +++ b/tests/_do_install_and_reboot.pm @@ -137,11 +137,6 @@ sub run { push (@actions, 'consoletty0') if (get_var("ARCH") eq "aarch64"); push (@actions, 'abrt') if (get_var("ABRT", '') eq "system"); push (@actions, 'rootpw') if (get_var("INSTALLER_NO_ROOT")); - # Patch for https://bugzilla.redhat.com/show_bug.cgi?id=1817004 - # Allow ppc64le Silverblue to boot after install - if (check_var('ARCH', 'ppc64le') && check_var('SUBVARIANT', 'Silverblue')) { - push (@actions, 'grubregen'); - } # memcheck test doesn't need to reboot at all. Rebooting from GUI # for lives is unreliable. And if we're already doing something # else at a console, we may as well reboot from there too @@ -189,10 +184,6 @@ sub run { my $root_password = get_var("ROOT_PASSWORD") || "weakpassword"; assert_script_run "echo 'root:$root_password' | chpasswd -R $mount"; } - if (grep {$_ eq 'grubregen'} @actions) { - record_soft_failure "brc#1817004, Regenerate grub.cfg for reboot success"; - assert_script_run "chroot $mount grub2-mkconfig -o /boot/grub2/grub.cfg"; - } type_string "reboot\n" if (grep {$_ eq 'reboot'} @actions); }