From a6ea09e4d5f25c061096d2a438c1a23ef20ec5d7 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 17 Mar 2021 16:57:50 -0700 Subject: [PATCH] Install plymouth in aarch64 encrypted test (workaround #1940163) Signed-off-by: Adam Williamson --- tests/_do_install_and_reboot.pm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm index a98e6a73..b4937e27 100644 --- a/tests/_do_install_and_reboot.pm +++ b/tests/_do_install_and_reboot.pm @@ -137,7 +137,9 @@ sub run { # there are various things we might have to do at a console here # before we actually reboot. let's figure them all out first... my @actions; + my $relnum = get_release_number; push (@actions, 'consoletty0') if (get_var("ARCH") eq "aarch64"); + push (@actions, 'plymouth') if (get_var("ARCH") eq "aarch64" && get_var("ENCRYPT_PASSWORD") && $relnum > 33); push (@actions, 'abrt') if (get_var("ABRT", '') eq "system"); push (@actions, 'rootpw') if (get_var("INSTALLER_NO_ROOT")); # memcheck test doesn't need to reboot at all. Rebooting from GUI @@ -179,6 +181,11 @@ sub run { # regenerate the bootloader config assert_script_run "chroot $mount grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg"; } + if (grep {$_ eq 'plymouth'} @actions) { + # FIXME: install plymouth to work around #1940163 + assert_script_run "chroot $mount dnf -y install plymouth", 180; + assert_script_run "chroot $mount dracut -f", 180; + } if (grep {$_ eq 'abrt'} @actions) { # Chroot in the newly installed system and switch on ABRT systemwide assert_script_run "chroot $mount abrt-auto-reporting 1";