srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-12-01 01:33:08 +00:00
Code Issues Releases Activity

Drop use of PXEBOOT, rely on default boot order

Browse Source 
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 <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2023-11-21 16:23:25 -08:00
parent 1343e1e7c0
commit 461e211618
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates.fif.json
View File

@ -1889,10 +1889,10 @@
"settings": { "settings": {
"+ISO": "", "+ISO": "",
"DELAYED_START": "1", "DELAYED_START": "1",
"IS_PXE": "1",
"KICKSTART": "1", "KICKSTART": "1",
"NICTYPE": "tap", "NICTYPE": "tap",
"PARALLEL_WITH": "support_server_2@%ARCH_BASE_MACHINE%", "PARALLEL_WITH": "support_server_2@%ARCH_BASE_MACHINE%",
"PXEBOOT": "once",
"ROOT_PASSWORD": "111111", "ROOT_PASSWORD": "111111",
"TEST_TARGET": "COMPOSE", "TEST_TARGET": "COMPOSE",
"USER_LOGIN": "false", "USER_LOGIN": "false",

4
tests/_boot_to_anaconda.pm
View File

@ -8,7 +8,7 @@ use anaconda;
sub run { sub run {
my $self = shift; my $self = shift;
if (get_var("PXEBOOT")) { if (get_var("IS_PXE")) {
# PXE tests have DELAYED_START set, so VM is not running yet, # PXE tests have DELAYED_START set, so VM is not running yet,
# because if we boot immediately PXE will time out waiting for # because if we boot immediately PXE will time out waiting for
# DHCP before the support server is ready. So we wait here 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 # we need a longer timeout for the PXE boot test
my $timeout = 30; 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, # call do_bootloader with postinstall=0, the params, and the mutex,
# unless we're a VNC install client (no bootloader there) # unless we're a VNC install client (no bootloader there)