Merge pull request autotest#5333 from vwu-vera/cvt-from-f

v2v:modify esx65/67 related testing for convert-from-file
dzhengfy · Dec 13, 2023 · 2694ef5 · 2694ef5
2 parents 44c51c4 + 936d490
commit 2694ef5
Showing 1 changed file with 18 additions and 18 deletions.
diff --git a/v2v/tests/cfg/convert_from_file.cfg b/v2v/tests/cfg/convert_from_file.cfg
@@ -186,30 +186,30 @@
                             variants:
                                 - latest8:
                                     v2v_debug = force_on
-                                    only esx_67
+                                    only esx_70
                                     main_vm = 'VM_NAME_RHEL8_V2V_EXAMPLE'
                                     msg_content = 'scp -T'
                                     expect_msg = yes
                                 - latest7:
-                                    only esx_67
+                                    only esx_70
                                     main_vm = 'VM_NAME_RHEL7_V2V_EXAMPLE'
                                 - latest6:
                                     enable_legacy_policy = yes
-                                    only esx_67
+                                    only esx_70
                                     main_vm = 'VM_NAME_RHEL6_V2V_EXAMPLE'
                                 - regular_user_sudo:
                                     checkpoint = 'regular_user_sudo'
                                     main_vm = 'VM_NAME_RHEL8_V2V_EXAMPLE'
                                     env_settings = 'eval `ssh-agent`;ssh-add;sudo -E LIBGUESTFS_BACKEND=direct'
                                     unprivileged_user = 'USER_UNPRIVILEGED_V2V_EXAMPLE'
                                     #os_directory = '/home/${unprivileged_user}'
-                                    only esx_67
+                                    only esx_70
                                 - nvme_disk:
-                                    only esx_67
+                                    only esx_70
                                     #add required version due to bug2070530
                                     version_required = "[virt-v2v-2.0.7-1.el9,)"
                                     main_vm = 'VM_NAME_NVME_RHEL8_V2V_EXAMPLE'
-                                    datastore = esx6.7-function
+                                    datastore = esx7.0-function
                                     #Skip pre-check by bz#2068992. Will modify once the bug fixed.
                                     skip_virsh_pre_conn = yes
                                 - percent_encode:
@@ -220,7 +220,7 @@
                                     datastore = esx7.0-function
                         - vmx_default:
                             # Default
-                            vmx_nfs_src = NFS_ESX67_VMX_V2V_EXAMPLE
+                            vmx_nfs_src = NFS_ESX70_VMX_V2V_EXAMPLE
                             # Do not skip vm checking by default
                             skip_vm_check = no
                             # By default, v2v will try to connect to source hypervisor
@@ -233,45 +233,45 @@
                             skip_virsh_pre_conn = no
                             variants:
                                 - win2012r2:
-                                    only esx_60
+                                    only esx_70
                                     only windows
                                     os_version = 'win2012r2'
                                     has_genid = 'no'
                                     main_vm = 'VM_NAME_GENID_WIN2012R2_V2V_EXAMPLE'
-                                    vmx_nfs_src = NFS_ESX60_VMX_V2V_EXAMPLE
+                                    vmx_nfs_src = NFS_ESX70_VMX_V2V_EXAMPLE
                                     # genid only supports libvirt, local, qemu
                                     only output_mode.libvirt
                                 - win2019:
-                                    only esx_67
+                                    only esx_70
                                     only windows
                                     os_version = 'win2019'
                                     has_genid = 'yes'
                                     main_vm = 'VM_NAME_GENID_WIN2019_V2V_EXAMPLE'
-                                    vmx_nfs_src = NFS_ESX67_VMX_V2V_EXAMPLE
+                                    vmx_nfs_src = NFS_ESX70_VMX_V2V_EXAMPLE
                                     # genid only supports libvirt, local, qemu
                                     only output_mode.libvirt
                                 - win10:
-                                    only esx_67
+                                    only esx_70
                                     only windows
                                     os_version = 'win10'
                                     has_genid = 'yes'
                                     main_vm = 'VM_NAME_GENID_WIN10_V2V_EXAMPLE'
-                                    vmx_nfs_src = NFS_ESX67_VMX_V2V_EXAMPLE
+                                    vmx_nfs_src = NFS_ESX70_VMX_V2V_EXAMPLE
                                     # genid only supports libvirt, local, qemu
                                     only output_mode.libvirt
                                 - latest8:
-                                    only esx_67
+                                    only esx_70
                                     main_vm = 'VM_NAME_RHEL8_V2V_EXAMPLE'
                                 - latest7:
-                                    only esx_67
+                                    only esx_70
                                     main_vm = 'VM_NAME_RHEL7_V2V_EXAMPLE'
                                 - latest6:
                                     enable_legacy_policy = yes
-                                    only esx_67
+                                    only esx_70
                                     main_vm = 'VM_NAME_RHEL6_V2V_EXAMPLE'
                                 - cpu_topology:
-                                    only esx_67
-                                    vmx_nfs_src = NFS_ESX67_VMX_V2V_EXAMPLE
+                                    only esx_70
+                                    vmx_nfs_src = NFS_ESX70_FUNC_VMX_V2V_EXAMPLE
                                     main_vm = 'VM_NAME_CPU_TOPOLOGY_V2V_EXAMPLE'
                                     v2v_debug = force_on
                                     checkpoint = 'cpu_topology'