Try different drivers for macOS

Signed-off-by: David Cassany <[email protected]>
rancher · Oct 30, 2023 · bf2cdb9 · bf2cdb9
1 parent 80828a2
commit bf2cdb9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/scripts/run_vm.sh b/scripts/run_vm.sh
@@ -30,7 +30,7 @@ function start {
   local accel_arg
   local memory_arg="-m ${ELMNTL_MEMORY}"
   local firmware_arg="-drive if=pflash,format=raw,readonly=on,file=${ELMNTL_FIRMWARE}"
-  local disk_arg="-drive file=${ELMNTL_TESTDISK},if=none,id=disk -device ide-hd,drive=disk,bootindex=1"
+  local disk_arg="-drive file=${ELMNTL_TESTDISK},if=none,id=disk,format=qcow2,media=disk -device virtio-blk-pci,drive=disk,bootindex=1"
   local serial_arg="-serial file:${ELMNTL_LOGFILE}"
   local pidfile_arg="-pidfile ${ELMNTL_PIDFILE}"
   local display_arg="-display ${ELMNTL_DISPLAY}"
@@ -60,7 +60,7 @@ function start {
         ;;
       *.iso)
         qemu-img create -f qcow2 "${ELMNTL_TESTDISK}" "${ELMNTL_DISKSIZE}" > /dev/null
-        cdrom_arg="-drive file=${base_disk},readonly=on,if=none,id=cdrom -device ahci,id=achi0 -device ide-cd,bus=achi0.0,drive=cdrom,id=cd1,bootindex=2"
+        cdrom_arg="-drive file=${base_disk},readonly=on,if=none,id=cdrom,media=cdrom -device virtio-scsi-pci,id=scsi0 -device scsi-cd,bus=scsi0.0,drive=cdrom,bootindex=2"
         ;;
       *)
         _abort "Expected a *.qcow2 or *.iso file"

diff --git a/tests/installer/installer_efi_test.go b/tests/installer/installer_efi_test.go
@@ -36,7 +36,7 @@ var _ = Describe("Elemental Installer EFI tests", func() {
 					err := s.SendFile("../assets/custom_partitions.yaml", "/etc/elemental/config.d/custom_partitions.yaml", "0770")
 					By("Running the elemental install with a layout file")
 					Expect(err).To(BeNil())
-					out, err := s.Command(s.ElementalCmd("install", "/dev/sda"))
+					out, err := s.Command(s.ElementalCmd("install", "/dev/vda"))
 					fmt.Printf(out)
 					Expect(err).To(BeNil())
 					Expect(out).To(ContainSubstring("Mounting disk partitions"))
@@ -50,7 +50,7 @@ var _ = Describe("Elemental Installer EFI tests", func() {
 					// check partition values
 					// Values have to match the yaml under ../assets/layout.yaml
 					// That is the file that the installer uses so partitions should match those values
-					disk := s.GetDiskLayout("/dev/sda")
+					disk := s.GetDiskLayout("/dev/vda")
 
 					for _, part := range []sut.PartitionEntry{
 						{