Skip to content

Commit

Permalink
Merge pull request #5441 from autotest/revert-5396-rename-main-name-i…
Browse files Browse the repository at this point in the history
…n-v2v-jobs

Revert "Rename main name in v2v jobs"
dzhengfy authored Feb 5, 2024
2 parents b95b78b + a58af02 commit ce8c384
Showing 3 changed files with 9 additions and 5 deletions.
6 changes: 4 additions & 2 deletions v2v/tests/cfg/convert_vm_to_libvirt.cfg
Original file line number Diff line number Diff line change
@@ -163,7 +163,8 @@
vir_mode = "hvm"
variants:
- vm:
main_vm = ${hypervisor}-${vir_mode}-${os_version}-${vm_arch}
# main_vm = ${hypervisor}-${vir_mode}-${os_version}-${vm_arch}
main_vm = "XEN_VM_NAME_V2V_EXAMPLE"
- esx:
only source_esx
vpx_pwd = ${vpx_password}
@@ -189,4 +190,5 @@
hostname = ${esx_hostname}
variants:
- vm:
main_vm = ${esx_version}-${os_version}-${vm_arch}${vm_boot}
# main_vm = ${esx_version}-${os_version}-${vm_arch}${vm_boot}
main_vm = "ESX_VM_NAME_V2V_EXAMPLE"
6 changes: 4 additions & 2 deletions v2v/tests/cfg/convert_vm_to_ovirt.cfg
Original file line number Diff line number Diff line change
@@ -195,7 +195,8 @@
vir_mode = "hvm"
variants:
- vm:
main_vm = ${hypervisor}-${vir_mode}-${os_version}-${vm_arch}
# main_vm = ${hypervisor}-${vir_mode}-${os_version}-${vm_arch}
main_vm = "XEN_VM_NAME_V2V_EXAMPLE"
- esx:
only source_esx
vpx_pwd = ${vpx_password}
@@ -221,4 +222,5 @@
hostname = ${vpx_hostname}
variants:
- vm:
main_vm = ${esx_version}-${os_version}-${vm_arch}${vm_boot}
# main_vm = ${esx_version}-${os_version}-${vm_arch}${vm_boot}
main_vm = "ESX_VM_NAME_V2V_EXAMPLE"
2 changes: 1 addition & 1 deletion v2v/tests/cfg/function_test_xen.cfg
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@

# Guest info
os_type = 'linux'
main_vm = ${hypervisor}-${vir_mode}-${os_version}-${vm_arch}
main_vm = 'XEN_VM_NAME_V2V_EXAMPLE'
username = 'root'
password = GENERAL_GUEST_PASSWORD
os_version = 'XEN_VM_OS_VERSION_V2V_EXAMPLE'

0 comments on commit ce8c384

Please sign in to comment.