Switch most CoreOS tests to UEFI

Keep one test on BIOS.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2024-03-20 14:25:09 -07:00
parent c879906d16
commit 4217ef9d4a
2 changed files with 21 additions and 12 deletions

View File

@ -476,6 +476,10 @@
"machine": "64bit",
"product": "fedora-CoreOS-colive-iso-x86_64-*"
},
"fedora-CoreOS-colive-iso-x86_64-*-uefi": {
"machine": "uefi",
"product": "fedora-CoreOS-colive-iso-x86_64-*"
},
"fedora-Everything-boot-iso-ppc64le-*-ppc64le": {
"machine": "ppc64le",
"product": "fedora-Everything-boot-iso-ppc64le-*"
@ -640,7 +644,7 @@
"fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 20,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 20,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 20,
"fedora-CoreOS-colive-iso-x86_64-*-64bit": 50,
"fedora-CoreOS-colive-iso-x86_64-*-uefi": 50,
"fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
"fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 20,
"fedora-KDE-live-iso-x86_64-*-64bit": 22,
@ -673,7 +677,7 @@
"fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 20,
"fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 20,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 20,
"fedora-CoreOS-colive-iso-x86_64-*-64bit": 50,
"fedora-CoreOS-colive-iso-x86_64-*-uefi": 50,
"fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
"fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 20,
"fedora-KDE-live-iso-x86_64-*-64bit": 22,
@ -763,7 +767,7 @@
"fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 40,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-64bit": 40,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 40,
"fedora-CoreOS-colive-iso-x86_64-*-64bit": 50,
"fedora-CoreOS-colive-iso-x86_64-*-uefi": 50,
"fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 40,
"fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 40,
"fedora-KDE-live-iso-x86_64-*-64bit": 42,
@ -796,7 +800,7 @@
"fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 40,
"fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 40,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 40,
"fedora-CoreOS-colive-iso-x86_64-*-64bit": 50,
"fedora-CoreOS-colive-iso-x86_64-*-uefi": 50,
"fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 40,
"fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 40,
"fedora-KDE-live-iso-x86_64-*-64bit": 42,
@ -829,7 +833,7 @@
"fedora-Cloud_Base-qcow2-qcow2-aarch64-*-aarch64": 40,
"fedora-Cloud_Base-qcow2-qcow2-ppc64le-*-ppc64le": 40,
"fedora-Cloud_Base-qcow2-qcow2-x86_64-*-uefi": 40,
"fedora-CoreOS-colive-iso-x86_64-*-64bit": 50,
"fedora-CoreOS-colive-iso-x86_64-*-uefi": 50,
"fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 40,
"fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 40,
"fedora-KDE-live-iso-x86_64-*-64bit": 42,
@ -1602,6 +1606,7 @@
"install_default": {
"profiles": {
"fedora-BaseOS-boot-iso-x86_64-*-uefi": 50,
"fedora-CoreOS-colive-iso-x86_64-*-64bit": 21,
"fedora-Everything-boot-iso-ppc64le-*-ppc64le": 62,
"fedora-Everything-boot-iso-x86_64-*-64bit": 10,
"fedora-Everything-boot-iso-x86_64-*-uefi": 11,
@ -1622,7 +1627,7 @@
"install_default_upload": {
"profiles": {
"fedora-BaseOS-dvd-iso-x86_64-*-uefi": 50,
"fedora-CoreOS-colive-iso-x86_64-*-64bit": 20,
"fedora-CoreOS-colive-iso-x86_64-*-uefi": 20,
"fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
"fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 20,
"fedora-KDE-live-iso-x86_64-*-64bit": 15,
@ -2338,7 +2343,7 @@
},
"podman": {
"profiles": {
"fedora-CoreOS-colive-iso-x86_64-*-64bit": 20,
"fedora-CoreOS-colive-iso-x86_64-*-uefi": 20,
"fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
"fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 40
},
@ -2356,7 +2361,7 @@
},
"podman_client": {
"profiles": {
"fedora-CoreOS-colive-iso-x86_64-*-64bit": 20,
"fedora-CoreOS-colive-iso-x86_64-*-uefi": 20,
"fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
"fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 40
},
@ -2461,7 +2466,7 @@
},
"release_identification": {
"profiles": {
"fedora-CoreOS-colive-iso-x86_64-*-64bit": 50,
"fedora-CoreOS-colive-iso-x86_64-*-uefi": 50,
"fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 40,
"fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 40,
"fedora-KDE-live-iso-x86_64-*-64bit": 42,
@ -2489,7 +2494,7 @@
},
"rpmostree_overlay": {
"profiles": {
"fedora-CoreOS-colive-iso-x86_64-*-64bit": 20,
"fedora-CoreOS-colive-iso-x86_64-*-uefi": 20,
"fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
"fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 20,
"fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
@ -2505,7 +2510,7 @@
},
"rpmostree_rebase": {
"profiles": {
"fedora-CoreOS-colive-iso-x86_64-*-64bit": 20,
"fedora-CoreOS-colive-iso-x86_64-*-uefi": 20,
"fedora-IoT-dvd_ostree-iso-aarch64-*-aarch64": 20,
"fedora-IoT-dvd_ostree-iso-x86_64-*-uefi": 20,
"fedora-Silverblue-dvd_ostree-iso-ppc64le-*-ppc64le": 50,
@ -2879,7 +2884,7 @@
"fedora-Workstation-live-iso-x86_64-*-64bit": 40,
"fedora-Workstation-live_osbuild-iso-x86_64-*-uefi": 60,
"fedora-Workstation-raw_xz-raw.xz-aarch64-*-aarch64": 40,
"fedora-CoreOS-colive-iso-x86_64-*-64bit": 40,
"fedora-CoreOS-colive-iso-x86_64-*-uefi": 40,
"fedora-Silverblue-dvd_ostree-iso-x86_64-*-64bit": 40
},
"settings": {

View File

@ -8,6 +8,10 @@ sub run {
assert_screen "user_console", 300;
type_string "sudo su\n";
assert_script_run "coreos-installer install /dev/vda --ignition-url https://www.happyassassin.net/temp/openqa.ign", 600;
# the CoreOS installer does not write an efibootmgr entry, so to
# ensure we boot from hard disk on next boot, wipe the entry for
# the optical drive
assert_script_run('efibootmgr -b $(efibootmgr | grep CD-ROM | head -1 | cut -f1 | sed -e "s,[^0-9],,g") -B') if (get_var("UEFI"));
type_string "reboot\n";
}