Merge pull request autotest#5509 from vwu-vera/rmesx6

v2v:delete esx6.0/6.5/6.7 from cfg files
chunfuwen · Mar 13, 2024 · 3a28269 · 3a28269
2 parents 1aba8c2 + 2646373
commit 3a28269
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 28 deletions.
diff --git a/v2v/tests/cfg/convert_vm_to_libvirt.cfg b/v2v/tests/cfg/convert_vm_to_libvirt.cfg
@@ -177,16 +177,6 @@
                 - 7_0:
                     only source_esx.esx_70
                     esx_version = "esx7.0"
-                - 6_7:
-                    only source_esx.esx_67
-                    esx_version = "esx6.7"
-                - 6_5:
-                    only source_esx.esx_65
-                    esx_version = "esx6.5"
-                - 6_0:
-                    only source_esx.esx_60
-                    esx_version = "esx6.0"
-                    no win11,win2022,latest9
             hostname = ${esx_hostname}
             variants:
                 - vm:

diff --git a/v2v/tests/cfg/convert_vm_to_ovirt.cfg b/v2v/tests/cfg/convert_vm_to_ovirt.cfg
@@ -209,16 +209,6 @@
                 - 7_0:
                     only source_esx.esx_70
                     esx_version = "esx7.0"
-                - 6_7:
-                    only source_esx.esx_67
-                    esx_version = "esx6.7"
-                - 6_5:
-                    only source_esx.esx_65
-                    esx_version = "esx6.5"
-                - 6_0:
-                    only source_esx.esx_60
-                    no win11,win2022,latest9
-                    esx_version = "esx6.0"
             hostname = ${vpx_hostname}
             variants:
                 - vm:

diff --git a/v2v/tests/cfg/function_test_esx.cfg b/v2v/tests/cfg/function_test_esx.cfg
@@ -67,12 +67,6 @@
                 - rhv:
                     output_method = "rhev"
     variants:
-        - esx_60:
-            only source_esx.esx_60
-        - esx_65:
-            only source_esx.esx_65
-        - esx_67:
-            only source_esx.esx_67
         - esx_70:
             only source_esx.esx_70
         - esx_80:
@@ -348,8 +342,8 @@
                     checkpoint = "vmtools,service
                     service_name = vmware-tools
         - modprobe:
-            only esx_60
-            main_vm = VM_NAME_RHEL5_V2V_EXAMPLE
+            only esx_70
+            main_vm = VM_NAME_RHEL6_V2V_EXAMPLE
             enable_legacy_policy = yes
             checkpoint = modprobe
             cfg_content = 'alias eth0 virtio_net'