From 461e211618b2171a78a0c8b93df56ad3851c8acd Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 21 Nov 2023 16:23:25 -0800 Subject: [PATCH] Drop use of PXEBOOT, rely on default boot order Per https://progress.opensuse.org/issues/151258 , PXEBOOT=once doesn't work right in current os-autoinst. Now I look at it, PXEBOOT is just pretty ropey in general; on UEFI and aarch64 it doesn't actually do anything at all, we're actually just relying on the default boot order there. Since it doesn't seem like there's a practical way to make PXEBOOT=once work as intended on all platforms, let's just drop use of it and make it clear that we rely on the default boot order: we hope that on first boot we'll get a PXE boot since no local media are bootable, then on second boot we'll get a local disk boot. We set up a new IS_PXE variable to cue the couple of places where the test logic needs to be different. Signed-off-by: Adam Williamson --- templates.fif.json | 2 +- tests/_boot_to_anaconda.pm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates.fif.json b/templates.fif.json index 5714320b..65798c43 100644 --- a/templates.fif.json +++ b/templates.fif.json @@ -1889,10 +1889,10 @@ "settings": { "+ISO": "", "DELAYED_START": "1", + "IS_PXE": "1", "KICKSTART": "1", "NICTYPE": "tap", "PARALLEL_WITH": "support_server_2@%ARCH_BASE_MACHINE%", - "PXEBOOT": "once", "ROOT_PASSWORD": "111111", "TEST_TARGET": "COMPOSE", "USER_LOGIN": "false", diff --git a/tests/_boot_to_anaconda.pm b/tests/_boot_to_anaconda.pm index 351d212f..10670b49 100644 --- a/tests/_boot_to_anaconda.pm +++ b/tests/_boot_to_anaconda.pm @@ -8,7 +8,7 @@ use anaconda; sub run { my $self = shift; - if (get_var("PXEBOOT")) { + if (get_var("IS_PXE")) { # PXE tests have DELAYED_START set, so VM is not running yet, # because if we boot immediately PXE will time out waiting for # DHCP before the support server is ready. So we wait here for @@ -72,7 +72,7 @@ sub run { # we need a longer timeout for the PXE boot test my $timeout = 30; - $timeout = 120 if (get_var("PXEBOOT")); + $timeout = 120 if (get_var("IS_PXE")); # call do_bootloader with postinstall=0, the params, and the mutex, # unless we're a VNC install client (no bootloader there)