testing/os-autoinst-distri-rocky
11
0
Fork 0
mirror of https://github.com/rocky-linux/os-autoinst-distri-rocky.git synced 2024-11-25 14:41:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

make sure we get logs from failed kickstart installs

Browse Source 
Summary:
by waiting for the bootloader in _boot_to_anaconda rather than
_console_wait_login, we can ensure that we use the anaconda
post-fail hook and thus get logs uploaded when a kickstart
install fails.

Test Plan:
Run a kickstart install test that fails and check
anaconda logs get uploaded. Then run one that works and make
sure it...still works.

Reviewers: jskladan, garretraziel

Reviewed By: garretraziel

Subscribers: tflink

Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D1005
This commit is contained in:
Adam Williamson 2016-09-19 16:50:42 -07:00
parent af00b71790
commit 1cdd8e18b7
7 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/fedorabase.pm
View File

@ -110,11 +110,11 @@ sub do_bootloader {
# if not postinstall and not UEFI, syslinux # if not postinstall and not UEFI, syslinux
$args{bootloader} //= ($args{uefi} || $args{postinstall}) ? "grub" : "syslinux"; $args{bootloader} //= ($args{uefi} || $args{postinstall}) ? "grub" : "syslinux";
if ($args{uefi}) { if ($args{uefi}) {
# we don't just tag all screens with 'bootloader' because we # we use the firmware-type specific tags because we want to be
# want to be sure we actually did a UEFI boot # sure we actually did a UEFI boot
assert_screen "bootloader_uefi", $args{timeout}; assert_screen "bootloader_uefi", $args{timeout};
} else { } else {
assert_screen "bootloader", $args{timeout}; assert_screen "bootloader_bios", $args{timeout};
} }
if ($args{mutex}) { if ($args{mutex}) {
# cancel countdown # cancel countdown

1
needles/console/bootloader_bios_installed.json
View File

@ -10,6 +10,7 @@
], ],
"tags": [ "tags": [
"bootloader", "bootloader",
"bootloader_bios",
"ENV-DISTRI-fedora" "ENV-DISTRI-fedora"
] ]
} }

1
needles/console/bootloader_bios_live.json
View File

@ -10,6 +10,7 @@
], ],
"tags": [ "tags": [
"bootloader", "bootloader",
"bootloader_bios",
"ENV-DISTRI-fedora", "ENV-DISTRI-fedora",
"ENV-FLAVOR-server" "ENV-FLAVOR-server"
] ]

1
needles/console/bootloader_bios_offline.json
View File

@ -10,6 +10,7 @@
], ],
"tags": [ "tags": [
"bootloader", "bootloader",
"bootloader_bios",
"ENV-DISTRI-fedora", "ENV-DISTRI-fedora",
"ENV-FLAVOR-server" "ENV-FLAVOR-server"
] ]

3
needles/console/bootloader_uefi.json
View File

@ -4,7 +4,8 @@
"ENV-FLAVOR-server_boot", "ENV-FLAVOR-server_boot",
"ENV-FLAVOR-workstation_live", "ENV-FLAVOR-workstation_live",
"ENV-UEFI-1", "ENV-UEFI-1",
"bootloader_uefi" "bootloader_uefi",
"bootloader"
], ],
"area": [ "area": [
{ {

9
tests/_boot_to_anaconda.pm
View File

@ -28,8 +28,13 @@ sub run {
$self->do_bootloader(postinstall=>0, params=>$params, mutex=>$mutex); $self->do_bootloader(postinstall=>0, params=>$params, mutex=>$mutex);
# proceed to installer # proceed to installer
unless (get_var("KICKSTART")) if (get_var("KICKSTART")) {
{ # wait for the bootloader *here* - in a test that inherits from
# anacondatest - so that if something goes wrong during install,
# we get anaconda logs
assert_screen "bootloader", 1800;
}
else {
if (get_var("ANACONDA_TEXT")) { if (get_var("ANACONDA_TEXT")) {
# select that we don't want to start VNC; we want to run in text mode # select that we don't want to start VNC; we want to run in text mode
assert_screen "anaconda_use_text_mode", 300; assert_screen "anaconda_use_text_mode", 300;

4
tests/_console_wait_login.pm
View File

@ -4,10 +4,8 @@ use testapi;
sub run { sub run {
my $self = shift; my $self = shift;
# If KICKSTART is set, then the wait_time needs to consider the # If UPGRADE is set, we have to wait for the entire upgrade
# install time. if UPGRADE, we have to wait for the entire upgrade
my $wait_time = 300; my $wait_time = 300;
$wait_time = 1800 if (get_var("KICKSTART"));
$wait_time = 6000 if (get_var("UPGRADE")); $wait_time = 6000 if (get_var("UPGRADE"));
# handle bootloader, if requested # handle bootloader, if requested