From 2646373675ada04c06e507a1d261cd6532797707 Mon Sep 17 00:00:00 2001 From: vwu-vera Date: Wed, 13 Mar 2024 17:25:23 +0800 Subject: [PATCH] v2v:delete esx6.0/6.5/6.7 from cfg files Signed-off-by: vwu-vera --- v2v/tests/cfg/convert_vm_to_libvirt.cfg | 10 ---------- v2v/tests/cfg/convert_vm_to_ovirt.cfg | 10 ---------- v2v/tests/cfg/function_test_esx.cfg | 10 ++-------- 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/v2v/tests/cfg/convert_vm_to_libvirt.cfg b/v2v/tests/cfg/convert_vm_to_libvirt.cfg index a274d74573..e61d6dff34 100644 --- 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 index 6292337d52..b53e711d0f 100644 --- 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 index 44aa8ada03..18f6baf038 100644 --- 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'