tools/libvirt_test.sh: remove hardcoded os-variant
Using rhel8-unknown for all distros was really weird, let's use the proper variants. Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
parent
2c4215a2d0
commit
6b1f1848e4
1 changed files with 6 additions and 2 deletions
|
|
@ -274,19 +274,23 @@ else
|
|||
# was 1024 before 8.9
|
||||
MIN_RAM="1536"
|
||||
NVRAM_TEMPLATE="nvram_template=/usr/share/edk2/ovmf/OVMF_VARS.fd"
|
||||
OS_VARIANT="rhel8-unknown"
|
||||
;;
|
||||
"centos-8")
|
||||
MIN_RAM="1536"
|
||||
NVRAM_TEMPLATE="nvram_template=/usr/share/edk2/ovmf/OVMF_VARS.fd"
|
||||
OS_VARIANT="centos-stream8"
|
||||
;;
|
||||
"rhel-9"*)
|
||||
MIN_RAM="1536"
|
||||
NVRAM_TEMPLATE=""
|
||||
OS_VARIANT="rhel9-unknown"
|
||||
;;
|
||||
"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"
|
||||
OS_VARIANT="centos-stream9"
|
||||
;;
|
||||
*)
|
||||
echo "unsupported distro: ${ID}-${VERSION_ID}"
|
||||
|
|
@ -302,7 +306,7 @@ else
|
|||
--disk path="${LIBVIRT_IMAGE_PATH}" \
|
||||
--disk path=${CLOUD_INIT_PATH},device=cdrom \
|
||||
--import \
|
||||
--os-variant rhel8-unknown \
|
||||
--os-variant "${OS_VARIANT}" \
|
||||
--noautoconsole \
|
||||
--boot uefi,"${NVRAM_TEMPLATE}" \
|
||||
--network network=integration,mac=34:49:22:B0:83:30
|
||||
|
|
@ -314,7 +318,7 @@ else
|
|||
--disk path="${LIBVIRT_IMAGE_PATH}" \
|
||||
--disk path=${CLOUD_INIT_PATH},device=cdrom \
|
||||
--import \
|
||||
--os-variant rhel8-unknown \
|
||||
--os-variant "${OS_VARIANT}" \
|
||||
--noautoconsole \
|
||||
--network network=integration,mac=34:49:22:B0:83:30
|
||||
fi
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue