From 460eee87bc1de2e4229ea6beb93151bdb9f94acb Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 7 Mar 2024 16:08:40 -0800 Subject: [PATCH] updates: test Silverblue install on UEFI as well as BIOS https://bugzilla.redhat.com/show_bug.cgi?id=2268505 made it clear that this is a bit of a hole. We don't test installing the Silverblue image we build on UEFI, only on BIOS. Add this as a separate test so we don't uselessly upload a disk image we won't use for any follow-on tests. This also adds an anaconda build that fixes a bug in this path as a workaround for F40, so the test won't fail on all F40 updates. Signed-off-by: Adam Williamson --- lib/utils.pm | 2 +- templates-updates.fif.json | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/utils.pm b/lib/utils.pm index 103b3fbf..2e62fe27 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -476,7 +476,7 @@ sub get_workarounds { my %workarounds = ( "38" => [], "39" => [], - "40" => ["FEDORA-2024-f0fdde3a5d", "FEDORA-2024-fd7685bc5f"], + "40" => ["FEDORA-2024-f0fdde3a5d", "FEDORA-2024-fd7685bc5f", "FEDORA-2024-2aca68bad6"], "41" => [], ); my $advortasks = $workarounds{$version}; diff --git a/templates-updates.fif.json b/templates-updates.fif.json index 0fe143ac..18fdd2a6 100644 --- a/templates-updates.fif.json +++ b/templates-updates.fif.json @@ -408,6 +408,17 @@ "STORE_HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2" } }, + "install_default_ostree": { + "profiles": { + "fedora-updates-silverblue-dvd_ostree-iso-x86_64-*-uefi": 5 + }, + "settings": { + "INSTALL": "1", + "ISO": "%ADVISORY_OR_TASK%-%SUBVARIANT%-ostree-%ARCH%.iso", + "PACKAGE_SET": "default", + "+START_AFTER_TEST": "ostree_build@%ARCH_BASE_MACHINE%" + } + }, "installer_build": { "profiles": { "fedora-updates-everything-boot-iso-x86_64-*-64bit": 5