Merge pull request autotest#5396 from mxie91/rename-main-name-in-v2v-…

…jobs Rename main name in v2v jobs
dzhengfy · Jan 29, 2024 · 6304db0 · 6304db0
2 parents 61bf684 + e4f14c5
commit 6304db0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/v2v/tests/cfg/convert_vm_to_libvirt.cfg b/v2v/tests/cfg/convert_vm_to_libvirt.cfg
@@ -163,8 +163,7 @@
                     vir_mode = "hvm"
             variants:
                 - vm:
-                    # main_vm = ${hypervisor}-${vir_mode}-${os_version}-${vm_arch}
-                    main_vm = "XEN_VM_NAME_V2V_EXAMPLE"
+                    main_vm = ${hypervisor}-${vir_mode}-${os_version}-${vm_arch}
         - esx:
             only source_esx
             vpx_pwd = ${vpx_password}
@@ -190,5 +189,4 @@
             hostname = ${esx_hostname}
             variants:
                 - vm:
-                    # main_vm = ${esx_version}-${os_version}-${vm_arch}${vm_boot}
-                    main_vm = "ESX_VM_NAME_V2V_EXAMPLE"
+                    main_vm = ${esx_version}-${os_version}-${vm_arch}${vm_boot}
diff --git a/v2v/tests/cfg/convert_vm_to_ovirt.cfg b/v2v/tests/cfg/convert_vm_to_ovirt.cfg
@@ -195,8 +195,7 @@
                     vir_mode = "hvm"
             variants:
                 - vm:
-                    # main_vm = ${hypervisor}-${vir_mode}-${os_version}-${vm_arch}
-                    main_vm = "XEN_VM_NAME_V2V_EXAMPLE"
+                    main_vm = ${hypervisor}-${vir_mode}-${os_version}-${vm_arch}
         - esx:
             only source_esx
             vpx_pwd = ${vpx_password}
@@ -222,5 +221,4 @@
             hostname = ${vpx_hostname}
             variants:
                 - vm:
-                    # main_vm = ${esx_version}-${os_version}-${vm_arch}${vm_boot}
-                    main_vm = "ESX_VM_NAME_V2V_EXAMPLE"
+                    main_vm = ${esx_version}-${os_version}-${vm_arch}${vm_boot}
diff --git a/v2v/tests/cfg/function_test_xen.cfg b/v2v/tests/cfg/function_test_xen.cfg
@@ -14,7 +14,7 @@
 
     # Guest info
     os_type = 'linux'
-    main_vm = 'XEN_VM_NAME_V2V_EXAMPLE'
+    main_vm = ${hypervisor}-${vir_mode}-${os_version}-${vm_arch}
     username = 'root'
     password = GENERAL_GUEST_PASSWORD
     os_version = 'XEN_VM_OS_VERSION_V2V_EXAMPLE'