From 861e1473d9515a7257e20b3ccd5bddacbd07f31a Mon Sep 17 00:00:00 2001
From: Sanne Raymaekers <sanne.raymaekers@gmail.com>
Date: Wed, 22 Feb 2023 16:39:03 +0100
Subject: [PATCH] test/vmware: boot VMs with EFI and use SCSI as a disk
 controller

Since we use streamOptimized images everywhere, we no longer need to use
IDE and boot with bios. Let's test a more realistic scenario.
---
 test/cases/api/common/vsphere.sh | 4 ++--
 test/cases/vmware.sh             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/cases/api/common/vsphere.sh b/test/cases/api/common/vsphere.sh
index bc7fdffc4..b80bcad63 100644
--- a/test/cases/api/common/vsphere.sh
+++ b/test/cases/api/common/vsphere.sh
@@ -152,9 +152,9 @@ function verifyInVSphere() {
         -folder="${GOVMOMI_FOLDER}" \
         -net="${GOVMOMI_NETWORK}" \
         -net.adapter=vmxnet3 \
-        -m=4096 -c=2 -g=rhel8_64Guest -on=true -firmware=bios \
+        -m=4096 -c=2 -g=rhel8_64Guest -on=true -firmware=efi \
         -disk="${VSPHERE_VM_NAME}/${VSPHERE_IMAGE_NAME}" \
-        -disk.controller=ide \
+        -disk.controller=scsi \
         -on=false \
         "${VSPHERE_VM_NAME}"
 
diff --git a/test/cases/vmware.sh b/test/cases/vmware.sh
index b923f5ee1..6de29c543 100755
--- a/test/cases/vmware.sh
+++ b/test/cases/vmware.sh
@@ -182,9 +182,9 @@ $GOVC_CMD vm.create -u "${GOVMOMI_USERNAME}":"${GOVMOMI_PASSWORD}"@"${GOVMOMI_UR
     -folder="${GOVMOMI_FOLDER}" \
     -net="${GOVMOMI_NETWORK}" \
     -net.adapter=vmxnet3 \
-    -m=4096 -c=2 -g=rhel8_64Guest -on=true -firmware=bios \
+    -m=4096 -c=2 -g=rhel8_64Guest -on=true -firmware=efi \
     -disk="${IMAGE_KEY}"/"${IMAGE_KEY}".vmdk \
-    --disk.controller=ide \
+    --disk.controller=scsi \
     "${IMAGE_KEY}"
 
 # tagging vm as testing object