QemuHCK: Apply platform options for studio VM

Signed-off-by: Akihiko Odaki <[email protected]>
HCK-CI · Nov 21, 2023 · eaefdd6 · eaefdd6
1 parent 81cb7e0
commit eaefdd6
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/lib/engines/hcktest/platforms/Win11_22H2x64_host_uefi_q35_viommu.json b/lib/engines/hcktest/platforms/Win11_22H2x64_host_uefi_q35_viommu.json
@@ -7,7 +7,7 @@
   "viommu_state": true,
   "enlightenments_state": true,
   "cpu": "host",
-  "st_image": "HLK11_22H2.qcow2",
+  "st_image": "HLK11_22H2-uefi.qcow2",
   "clients": {
     "c1": {
       "name": "CL1",

diff --git a/lib/engines/hcktest/platforms/Win11nextx64_host_uefi_q35_viommu.json b/lib/engines/hcktest/platforms/Win11nextx64_host_uefi_q35_viommu.json
@@ -7,7 +7,7 @@
   "viommu_state": true,
   "enlightenments_state": true,
   "cpu": "host",
-  "st_image": "HLK11_next.qcow2",
+  "st_image": "HLK11_next-uefi.qcow2",
   "clients": {
     "c1": {
       "name": "CL1",

diff --git a/lib/engines/hcktest/platforms/Win2016x64_uefi.json b/lib/engines/hcktest/platforms/Win2016x64_uefi.json
@@ -2,7 +2,7 @@
   "name": "Win2016x64",
   "kit": "HLK1607",
   "fw_type": "uefi",
-  "st_image": "HLK1607.qcow2",
+  "st_image": "HLK1607-uefi.qcow2",
   "clients": {
     "c1": {
       "name": "CL1",

diff --git a/lib/engines/hcktest/platforms/Win2019x64_uefi.json b/lib/engines/hcktest/platforms/Win2019x64_uefi.json
@@ -2,7 +2,7 @@
   "name": "Win2019x64",
   "kit": "HLK1809server",
   "fw_type": "uefi",
-  "st_image": "HLK1809.qcow2",
+  "st_image": "HLK1809-uefi.qcow2",
   "clients": {
     "c1": {
       "name": "CL1",

diff --git a/lib/engines/hcktest/platforms/Win2022nextx64_host_uefi_q35_viommu.json b/lib/engines/hcktest/platforms/Win2022nextx64_host_uefi_q35_viommu.json
@@ -6,7 +6,7 @@
   "viommu_state": true,
   "enlightenments_state": true,
   "cpu": "host",
-  "st_image": "HLK2022_next.qcow2",
+  "st_image": "HLK2022_next-uefi.qcow2",
   "clients": {
     "c1": {
       "name": "CL1",

diff --git a/lib/engines/hcktest/platforms/Win2022x64_host_uefi_q35_viommu.json b/lib/engines/hcktest/platforms/Win2022x64_host_uefi_q35_viommu.json
@@ -6,7 +6,7 @@
   "viommu_state": true,
   "enlightenments_state": true,
   "cpu": "host",
-  "st_image": "HLK2022.qcow2",
+  "st_image": "HLK2022-uefi.qcow2",
   "clients": {
     "c1": {
       "name": "CL1",

diff --git a/lib/engines/hcktest/platforms/Win2022x64_uefi.json b/lib/engines/hcktest/platforms/Win2022x64_uefi.json
@@ -2,7 +2,7 @@
   "name": "Win2022x64_uefi",
   "kit": "HLK2022",
   "fw_type": "uefi",
-  "st_image": "HLK2022.qcow2",
+  "st_image": "HLK2022-uefi.qcow2",
   "clients": {
     "c1": {
       "name": "CL1",

diff --git a/lib/setupmanagers/qemuhck/qemuhck.rb b/lib/setupmanagers/qemuhck/qemuhck.rb
@@ -48,7 +48,7 @@ def initialize_studio_vm
                                      'logger' => @logger,
                                      'slirp' => @slirp,
                                      'iso_path' => @project.config['iso_path']
-                                   })
+                                   }.merge(platform_options))
     end
 
     def drivers_options