PR#203: Revert 2 commits brc#1817004 for ppc64le Silverblue to boot - fedora-qa/os-autoinst-distri-fedora

fedora-qa / os-autoinst-distri-fedora

#203 Revert 2 commits brc#1817004 for ppc64le Silverblue to boot

Merged 3 years ago by adamwill. Opened 3 years ago by michelmno.

fedora-qa/ michelmno/os-autoinst-distri-fedora revert_brc1817004 into master

Revert 2 commits brc#1817004 for ppc64le Silverblue to boot

Michel Normand • 3 years ago

86b354a

file modified

-9

		`@@ -137,11 +137,6 @@`
		`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 @@`
		`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);`
		`}`

michelmno commented 3 years ago

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

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

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

zuul commented 3 years ago

Build succeeded.

os-autoinst-tox : SUCCESS in 3m 30s
os-autoinst-perl : SUCCESS in 5m 14s

Pull-Request has been merged by adamwill

3 years ago

adamwill commented 3 years ago

we could make it conditional so it still runs on F32 and earlier, but I don't really see a case where we're likely to test F32 Silverblue again so it doesn't seem necessary. Thanks.