From 89b71d339ee6981bcffcbb720138900f6b69c330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Budai?= Date: Tue, 6 Jun 2023 13:44:30 +0200 Subject: [PATCH] tools/libvirt_test.sh: merge two similar switch statements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No need for more switching than just one. Signed-off-by: Ondřej Budai --- tools/libvirt_test.sh | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/tools/libvirt_test.sh b/tools/libvirt_test.sh index a170cd8ce..274535f74 100755 --- a/tools/libvirt_test.sh +++ b/tools/libvirt_test.sh @@ -270,29 +270,24 @@ elif [[ $ARCH == 's390x' ]]; then --network network=integration,mac=34:49:22:B0:83:30 else case "${ID}-${VERSION_ID}" in - "rhel-8"* | "centos-8") + "rhel-8"*) # was 1024 before 8.9 MIN_RAM="1536" - ;; - "rhel-9"* | "centos-9") - MIN_RAM="1536" - ;; - *) - echo "unsupported distro: ${ID}-${VERSION_ID}" - exit 1;; - esac - - case "${ID}-${VERSION_ID}" in - "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" - ;; + "centos-8") + MIN_RAM="1536" + NVRAM_TEMPLATE="nvram_template=/usr/share/edk2/ovmf/OVMF_VARS.fd" + ;; "rhel-9"*) + MIN_RAM="1536" NVRAM_TEMPLATE="" ;; + "centos-9") + MIN_RAM="1536" + # Disable secure boot for CS9 due to bug bz#2108646 + NVRAM_TEMPLATE="firmware.feature0.name=secure-boot,firmware.feature0.enabled=no" + ;; *) echo "unsupported distro: ${ID}-${VERSION_ID}" exit 1;;