PR#156: Regenerate grub.cfg for ppc64le Silverblue to boot, brc#1817004 - fedora-qa/os-autoinst-distri-fedora

fedora-qa / os-autoinst-distri-fedora

#156 Regenerate grub.cfg for ppc64le Silverblue to boot, brc#1817004

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

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

Regenerate grub.cfg for ppc64le Silverblue to boot, brc#1817004

Guy Menanteau • 4 years ago

8d7be9a

tests/_do_install_and_reboot.pm

file modified

+10

		`@@ -139,6 +139,12 @@`
		`# for lives is unreliable. And if we're already doing something`
		`# else at a console, we may as well reboot from there too`
		`push (@actions, 'reboot') if (!get_var("MEMCHECK") && (get_var("LIVE") \|\| @actions));`
		`+ # Patch for https://bugzilla.redhat.com/show_bug.cgi?id=1817004`
		`+ # Allow ppc64le Silverblue to boot after install`
		`+ if ((get_var("ARCH") eq 'ppc64le') && \`
		`+ (get_var("SUBVARIANT") eq "Silverblue")) {`
		`+ push (@actions, 'grubregen');`
		`+ }`
		`# our approach for taking all these actions doesn't work on VNC`
		`# installs, fortunately we don't need any of them in that case`
		`# yet, so for now let's just flush the list here if we're VNC`
		`@@ -182,6 +188,10 @@`
		`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 4 years ago

bypass for https://bugzilla.redhat.com/show_bug.cgi?id=1817004

zuul commented 4 years ago

Build succeeded.

os-autoinst-tox : SUCCESS in 2m 07s
os-autoinst-perl : SUCCESS in 4m 18s

adamwill commented 4 years ago

Can you please redo this to work with the whole @actions approach we're using here? i.e. you need to add a line like push @actions "grubregen" if ((get_var("ARCH") eq 'ppc64le') && (get_var("SUBVARIANT") eq "Silverblue")); up with the other lines that populate @actions, then change the conditional for the 'action' block to if (grep {$_ eq 'grubregen'} @actions) { .

This is actually incorrect as written because we won't necessarily hit this block at all - notice that we already return undef earlier if nothing is in @actions. If this works at present it's only because the affected case happens to be hitting one of the other cases where we add an action as well, but it's not correct to rely on that.

rebased onto 8d7be9a

4 years ago