testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

Revert 2 commits brc#1817004 for ppc64le Silverblue to boot

Browse Source 
Revert "Regenerate grub.cfg for ppc64le Silverblue to boot (step 2)"
This reverts commit d384cfed30.

Revert "Regenerate grub.cfg for ppc64le Silverblue to boot, brc#1817004"
This reverts commit 8d7be9a227.

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 <menantea@linux.vnet.ibm.com>
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
This commit is contained in:
Michel Normand 2020-09-25 08:20:16 +02:00
parent 886a22c35f
commit 86b354ad63
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/_do_install_and_reboot.pm
View File

@ -137,11 +137,6 @@ sub run {
push (@actions, 'consoletty0') if (get_var("ARCH") eq "aarch64"); push (@actions, 'consoletty0') if (get_var("ARCH") eq "aarch64");
push (@actions, 'abrt') if (get_var("ABRT", '') eq "system"); push (@actions, 'abrt') if (get_var("ABRT", '') eq "system");
push (@actions, 'rootpw') if (get_var("INSTALLER_NO_ROOT")); 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 # memcheck test doesn't need to reboot at all. Rebooting from GUI
# for lives is unreliable. And if we're already doing something # for lives is unreliable. And if we're already doing something
# else at a console, we may as well reboot from there too # 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"; my $root_password = get_var("ROOT_PASSWORD") || "weakpassword";
assert_script_run "echo 'root:$root_password' | chpasswd -R $mount"; 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); type_string "reboot\n" if (grep {$_ eq 'reboot'} @actions);
} }