From 25161a831609401ac1f54335a682cae9a8292a5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Budai?= Date: Fri, 12 May 2023 08:31:11 +0200 Subject: [PATCH] libvirt_test: stop setting nvram in virt-install on RHEL 9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We use CDN repositories when running tests on GA RHEL. Thus, our RHEL 9.1 machines are actually pulling packages from RHEL 9.2. Therefore, we are now getting virt-install >= 4. This version brings firmware auto-detection and doesn't support nvram_template anymore. Let's remove it then. See 966049ec3c9baf40adc16ed3773e30046aff0d6b Signed-off-by: Ondřej Budai --- tools/libvirt_test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libvirt_test.sh b/tools/libvirt_test.sh index 7a3a640c2..22cbc83c3 100755 --- a/tools/libvirt_test.sh +++ b/tools/libvirt_test.sh @@ -283,14 +283,14 @@ else esac case "${ID}-${VERSION_ID}" in - "rhel-8"* | "rhel-9.0" | "rhel-9.1" | "centos-8") + "rhel-8"* | "centos-8") NVRAM_TEMPLATE="nvram_template=/usr/share/edk2/ovmf/OVMF_VARS.fd" ;; "centos-9" ) # Disable secure boot for CS9 due to bug bz#2108646 NVRAM_TEMPLATE="firmware.feature0.name=secure-boot,firmware.feature0.enabled=no" ;; - "rhel-9.2") + "rhel-9"*) NVRAM_TEMPLATE="" ;; *)