try cvi for legacy

universal-itengineer · universal-itengineer · commit 636d59124290 · 2026-03-16T17:26:29.000+03:00
Signed-off-by: Nikita Korolev &lt;nikita.korolev@flant.com&gt;
diff --git a/test/e2e/internal/label/label.go b/test/e2e/internal/label/label.go
@@ -27,3 +27,7 @@ func Slow() Labels {
 func TPM() Labels {
 	return Label("TPM")
 }
+
+func Legacy() Labels {
+	return Label("Legacy")
+}
diff --git a/test/e2e/internal/object/const.go b/test/e2e/internal/object/const.go
@@ -17,13 +17,15 @@ limitations under the License.
 package object
 
 const (
-	ImageURLAlpineUEFI      = "https://89d64382-20df-4581-8cc7-80df331f67fa.selstorage.ru/alpine/alpine-3-23-3-uefi-base.qcow2"
-	ImageURLAlpineBIOS      = "https://89d64382-20df-4581-8cc7-80df331f67fa.selstorage.ru/alpine/alpine-3-23-3-bios-base.qcow2"
-	ImagesURLAlpineUEFIPerf = "https://89d64382-20df-4581-8cc7-80df331f67fa.selstorage.ru/alpine/alpine-3-21-uefi-perf.qcow2"
-	ImagesURLAlpineBIOSPerf = "https://89d64382-20df-4581-8cc7-80df331f67fa.selstorage.ru/alpine/alpine-3-21-bios-perf.qcow2"
-	ImageURLUbuntu          = "https://89d64382-20df-4581-8cc7-80df331f67fa.selstorage.ru/ubuntu/ubuntu-24.04-minimal-cloudimg-amd64.qcow2"
-	ImageURLContainerImage  = "cr.yandex/crpvs5j3nh1mi2tpithr/e2e/alpine/alpine-image:latest"
+	ImageURLAlpineUEFI           = "https://89d64382-20df-4581-8cc7-80df331f67fa.selstorage.ru/alpine/alpine-3-23-3-uefi-base.qcow2"
+	ImageURLAlpineBIOS           = "https://89d64382-20df-4581-8cc7-80df331f67fa.selstorage.ru/alpine/alpine-3-23-3-bios-base.qcow2"
+	ImagesURLAlpineUEFIPerf      = "https://89d64382-20df-4581-8cc7-80df331f67fa.selstorage.ru/alpine/alpine-3-21-uefi-perf.qcow2"
+	ImagesURLAlpineBIOSPerf      = "https://89d64382-20df-4581-8cc7-80df331f67fa.selstorage.ru/alpine/alpine-3-21-bios-perf.qcow2"
+	ImageURLUbuntu               = "https://89d64382-20df-4581-8cc7-80df331f67fa.selstorage.ru/ubuntu/ubuntu-24.04-minimal-cloudimg-amd64.qcow2"
+	ImageURLContainerImage       = "cr.yandex/crpvs5j3nh1mi2tpithr/e2e/alpine/alpine-image:latest"
 	ImageURLLegacyContainerImage = "cr.yandex/crpvs5j3nh1mi2tpithr/e2e/alpine/alpine-3-20:latest"
+	ImageURLCirros               = "https://89d64382-20df-4581-8cc7-80df331f67fa.selstorage.ru/cirros/cirros-0.5.1.qcow2"
+	ImageURLUbuntuISO            = "https://89d64382-20df-4581-8cc7-80df331f67fa.selstorage.ru/ubuntu/ubuntu-24.04.2-live-server-amd64.iso"
 	// No bootable
 	ImageTestDataQCOW = "https://89d64382-20df-4581-8cc7-80df331f67fa.selstorage.ru/test/test.qcow2"
 	ImageTestDataISO  = "https://89d64382-20df-4581-8cc7-80df331f67fa.selstorage.ru/test/test.iso"
diff --git a/test/e2e/internal/object/precreated_cvi.go b/test/e2e/internal/object/precreated_cvi.go
@@ -27,8 +27,10 @@ const (
 	PrecreatedCVIAlpineUEFIPerf = "v12n-e2e-alpine-uefi-perf"
 	PrecreatedCVIAlpineBIOSPerf = "v12n-e2e-alpine-bios-perf"
 	PrecreatedCVIUbuntu         = "v12n-e2e-ubuntu"
+	PrecreatedCVIUbuntuISO      = "v12n-e2e-ubuntu-iso"
 	PrecreatedCVIContainerImage = "v12n-e2e-container-image"
 	PrecreatedCVILegacyRegistry = "v12n-e2e-legacy-registry"
+	PrecreatedCVICirros         = "v12n-e2e-cirros"
 	PrecreatedCVITestDataQCOW   = "v12n-e2e-testdata-qcow"
 	PrecreatedCVITestDataISO    = "v12n-e2e-testdata-iso"
 )
@@ -41,8 +43,10 @@ func PrecreatedClusterVirtualImages() []*v1alpha2.ClusterVirtualImage {
 		newPrecreatedHTTPCVI(PrecreatedCVIAlpineUEFIPerf, ImagesURLAlpineUEFIPerf),
 		newPrecreatedHTTPCVI(PrecreatedCVIAlpineBIOSPerf, ImagesURLAlpineBIOSPerf),
 		newPrecreatedHTTPCVI(PrecreatedCVIUbuntu, ImageURLUbuntu),
+		newPrecreatedHTTPCVI(PrecreatedCVIUbuntuISO, ImageURLUbuntuISO),
 		newPrecreatedContainerImageCVI(PrecreatedCVIContainerImage, ImageURLContainerImage),
 		newPrecreatedContainerImageCVI(PrecreatedCVILegacyRegistry, ImageURLLegacyContainerImage),
+		newPrecreatedHTTPCVI(PrecreatedCVICirros, ImageURLCirros),
 		newPrecreatedHTTPCVI(PrecreatedCVITestDataQCOW, ImageTestDataQCOW),
 		newPrecreatedHTTPCVI(PrecreatedCVITestDataISO, ImageTestDataISO),
 	}
diff --git a/test/e2e/legacy/affinity_toleration.go b/test/e2e/legacy/affinity_toleration.go
@@ -31,9 +31,10 @@ import (
 	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 	"github.com/deckhouse/virtualization/api/core/v1alpha2/vmcondition"
 	kc "github.com/deckhouse/virtualization/test/e2e/internal/kubectl"
+	"github.com/deckhouse/virtualization/test/e2e/internal/label"
 )
 
-var _ = Describe("VirtualMachineAffinityAndToleration", Ordered, func() {
+var _ = Describe("VirtualMachineAffinityAndToleration", Ordered, label.Legacy(), func() {
 	const (
 		nodeLabelKey   = "kubernetes.io/hostname"
 		masterLabelKey = "node.deckhouse.io/group"
diff --git a/test/e2e/legacy/complex.go b/test/e2e/legacy/complex.go
@@ -28,6 +28,7 @@ import (
 	"github.com/deckhouse/virtualization/test/e2e/internal/config"
 	"github.com/deckhouse/virtualization/test/e2e/internal/framework"
 	kc "github.com/deckhouse/virtualization/test/e2e/internal/kubectl"
+	"github.com/deckhouse/virtualization/test/e2e/internal/label"
 	"github.com/deckhouse/virtualization/test/e2e/internal/util"
 )
 
@@ -36,7 +37,7 @@ const (
 	antiAffinityLabel = "anti-affinity"
 )
 
-var _ = Describe("ComplexTest", Ordered, func() {
+var _ = Describe("ComplexTest", Ordered, label.Legacy(), func() {
 	var (
 		testCaseLabel            = map[string]string{"testcase": "complex-test"}
 		hasNoConsumerLabel       = map[string]string{"hasNoConsumer": "complex-test"}
diff --git a/test/e2e/legacy/image_hotplug.go b/test/e2e/legacy/image_hotplug.go
@@ -31,9 +31,10 @@ import (
 	"github.com/deckhouse/virtualization/test/e2e/internal/d8"
 	"github.com/deckhouse/virtualization/test/e2e/internal/framework"
 	kc "github.com/deckhouse/virtualization/test/e2e/internal/kubectl"
+	"github.com/deckhouse/virtualization/test/e2e/internal/label"
 )
 
-var _ = Describe("ImageHotplug", Ordered, func() {
+var _ = Describe("ImageHotplug", Ordered, label.Legacy(), func() {
 	const (
 		viCount  = 2
 		cviCount = 2
@@ -55,13 +56,6 @@ var _ = Describe("ImageHotplug", Ordered, func() {
 		ns, err = kustomize.GetNamespace(kustomization)
 		Expect(err).NotTo(HaveOccurred(), "%w", err)
 
-		res := kubectl.Delete(kc.DeleteOptions{
-			IgnoreNotFound: true,
-			Labels:         testCaseLabel,
-			Resource:       kc.ResourceCVI,
-		})
-		Expect(res.Error()).NotTo(HaveOccurred())
-
 		CreateNamespace(ns)
 	})
 
@@ -88,13 +82,6 @@ var _ = Describe("ImageHotplug", Ordered, func() {
 					Timeout:   MaxWaitTimeout,
 				})
 			})
-			By(fmt.Sprintf("`ClusterVirtualImages` should be in the %q phase", v1alpha2.ImageReady), func() {
-				WaitPhaseByLabel(kc.ResourceCVI, PhaseReady, kc.WaitOptions{
-					Labels:    testCaseLabel,
-					Namespace: ns,
-					Timeout:   MaxWaitTimeout,
-				})
-			})
 			By(fmt.Sprintf("`VirtualDisk` should be in the %q phase", v1alpha2.DiskReady), func() {
 				WaitPhaseByLabel(kc.ResourceVD, PhaseReady, kc.WaitOptions{
 					Labels:    testCaseLabel,
diff --git a/test/e2e/legacy/testdata/complex-test/cvi/cvi-alpine-http.yaml b/test/e2e/legacy/testdata/complex-test/cvi/cvi-alpine-http.yaml
diff --git a/test/e2e/legacy/testdata/complex-test/cvi/cvi-alpine-registry.yaml b/test/e2e/legacy/testdata/complex-test/cvi/cvi-alpine-registry.yaml
diff --git a/test/e2e/legacy/testdata/complex-test/cvi/cvi-from-cvi-alpine-http.yaml b/test/e2e/legacy/testdata/complex-test/cvi/cvi-from-cvi-alpine-http.yaml
diff --git a/test/e2e/legacy/testdata/complex-test/cvi/cvi-from-vi-alpine-http.yaml b/test/e2e/legacy/testdata/complex-test/cvi/cvi-from-vi-alpine-http.yaml
diff --git a/test/e2e/legacy/testdata/complex-test/cvi/kustomization.yaml b/test/e2e/legacy/testdata/complex-test/cvi/kustomization.yaml
diff --git a/test/e2e/legacy/testdata/vm-migration/cvi/cvi-cirros.yaml b/test/e2e/legacy/testdata/vm-migration/cvi/cvi-cirros.yaml
diff --git a/test/e2e/legacy/testdata/vm-migration/cvi/kustomization.yaml b/test/e2e/legacy/testdata/vm-migration/cvi/kustomization.yaml
diff --git a/test/e2e/legacy/testdata/vm-migration/kustomization.yaml b/test/e2e/legacy/testdata/vm-migration/kustomization.yaml
@@ -4,7 +4,6 @@ namespace: testcases
 namePrefix: pr-number-or-commit-hash-
 resources:
   - vi
-  - cvi
   - vm
   - ns.yaml
 configurations:
diff --git a/test/e2e/legacy/testdata/vm-migration/vm/overlays/with-cvi/kustomization.yaml b/test/e2e/legacy/testdata/vm-migration/vm/overlays/with-cvi/kustomization.yaml
@@ -11,7 +11,7 @@ patches:
         path: /spec/blockDeviceRefs/-
         value: {
           "kind": "ClusterVirtualImage",
-          "name": "cvi-cirros"
+          "name": "v12n-e2e-cirros"
         }
     target:
       kind: VirtualMachine
diff --git a/test/e2e/legacy/vd_snapshots.go b/test/e2e/legacy/vd_snapshots.go
@@ -32,6 +32,7 @@ import (
 	"github.com/deckhouse/virtualization/api/core/v1alpha2/vmcondition"
 	"github.com/deckhouse/virtualization/test/e2e/internal/config"
 	kc "github.com/deckhouse/virtualization/test/e2e/internal/kubectl"
+	"github.com/deckhouse/virtualization/test/e2e/internal/label"
 	"github.com/deckhouse/virtualization/test/e2e/internal/util"
 )
 
@@ -41,7 +42,7 @@ const (
 	frozenReasonPollingInterval    = 1 * time.Second
 )
 
-var _ = Describe("VirtualDiskSnapshots", Ordered, func() {
+var _ = Describe("VirtualDiskSnapshots", Ordered, label.Legacy(), func() {
 	var (
 		testCaseLabel            = map[string]string{"testcase": "vd-snapshots", "id": namePrefix}
 		attachedVirtualDiskLabel = map[string]string{"attachedVirtualDisk": ""}
diff --git a/test/e2e/legacy/vm_disk_attachment.go b/test/e2e/legacy/vm_disk_attachment.go
@@ -29,14 +29,15 @@ import (
 	"github.com/deckhouse/virtualization/test/e2e/internal/d8"
 	"github.com/deckhouse/virtualization/test/e2e/internal/framework"
 	kc "github.com/deckhouse/virtualization/test/e2e/internal/kubectl"
+	"github.com/deckhouse/virtualization/test/e2e/internal/label"
 	"github.com/deckhouse/virtualization/test/e2e/internal/util"
 )
 
 const unacceptableCount = -1000
 
 var APIVersion = v1alpha2.SchemeGroupVersion.String()
 
-var _ = Describe("VirtualDiskAttachment", Ordered, func() {
+var _ = Describe("VirtualDiskAttachment", Ordered, label.Legacy(), func() {
 	var (
 		testCaseLabel            = map[string]string{"testcase": "vm-disk-attachment"}
 		hasNoConsumerLabel       = map[string]string{"hasNoConsumer": "vm-disk-attachment"}
diff --git a/test/e2e/legacy/vm_disk_resizing.go b/test/e2e/legacy/vm_disk_resizing.go
@@ -33,9 +33,10 @@ import (
 	"github.com/deckhouse/virtualization/test/e2e/internal/d8"
 	"github.com/deckhouse/virtualization/test/e2e/internal/framework"
 	kc "github.com/deckhouse/virtualization/test/e2e/internal/kubectl"
+	"github.com/deckhouse/virtualization/test/e2e/internal/label"
 )
 
-var _ = Describe("VirtualDiskResizing", Ordered, func() {
+var _ = Describe("VirtualDiskResizing", Ordered, label.Legacy(), func() {
 	const (
 		vmCount   = 1
 		diskCount = 3
diff --git a/test/e2e/legacy/vm_evacuation.go b/test/e2e/legacy/vm_evacuation.go
@@ -32,9 +32,10 @@ import (
 	"github.com/deckhouse/virtualization/test/e2e/internal/config"
 	"github.com/deckhouse/virtualization/test/e2e/internal/framework"
 	kc "github.com/deckhouse/virtualization/test/e2e/internal/kubectl"
+	"github.com/deckhouse/virtualization/test/e2e/internal/label"
 )
 
-var _ = Describe("VirtualMachineEvacuation", Ordered, func() {
+var _ = Describe("VirtualMachineEvacuation", Ordered, label.Legacy(), func() {
 	testCaseLabel := map[string]string{"testcase": "vm-evacuation"}
 	kubeClient := framework.GetClients().KubeClient()
 	var ns string
diff --git a/test/e2e/legacy/vm_label_annotation.go b/test/e2e/legacy/vm_label_annotation.go
@@ -26,12 +26,13 @@ import (
 
 	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 	kc "github.com/deckhouse/virtualization/test/e2e/internal/kubectl"
+	"github.com/deckhouse/virtualization/test/e2e/internal/label"
 )
 
 // TODO: When this test case is refactored with the new end-to-end test framework,
 // it should check labels and annotations on all resources: KVVM, KVVMI, and Pod.
 // KVVM must contain propagated metadata in the spec.template.metadata field.
-var _ = Describe("VirtualMachineLabelAndAnnotation", Ordered, func() {
+var _ = Describe("VirtualMachineLabelAndAnnotation", Ordered, label.Legacy(), func() {
 	const (
 		specialKey   = "specialKey"
 		specialValue = "specialValue"
diff --git a/test/e2e/legacy/vm_migration_cancel.go b/test/e2e/legacy/vm_migration_cancel.go
@@ -30,9 +30,10 @@ import (
 	"github.com/deckhouse/virtualization/test/e2e/internal/d8"
 	"github.com/deckhouse/virtualization/test/e2e/internal/framework"
 	kc "github.com/deckhouse/virtualization/test/e2e/internal/kubectl"
+	"github.com/deckhouse/virtualization/test/e2e/internal/label"
 )
 
-var _ = Describe("VirtualMachineCancelMigration", Ordered, func() {
+var _ = Describe("VirtualMachineCancelMigration", Ordered, label.Legacy(), func() {
 	testCaseLabel := map[string]string{"testcase": "vm-migration-cancel"}
 	var ns string
 
diff --git a/test/e2e/legacy/vm_version.go b/test/e2e/legacy/vm_version.go
@@ -24,9 +24,10 @@ import (
 
 	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 	kc "github.com/deckhouse/virtualization/test/e2e/internal/kubectl"
+	"github.com/deckhouse/virtualization/test/e2e/internal/label"
 )
 
-var _ = Describe("VirtualMachineVersions", Ordered, func() {
+var _ = Describe("VirtualMachineVersions", Ordered, label.Legacy(), func() {
 	testCaseLabel := map[string]string{"testcase": "vm-versions"}
 	var ns string
 

Original file line number	Diff line number	Diff line change
`@@ -27,3 +27,7 @@ func Slow() Labels {`
`27`	`27`	`func TPM() Labels {`
`28`	`28`	`return Label("TPM")`
`29`	`29`	`}`
	`30`	`+`
	`31`	`+func Legacy() Labels {`
	`32`	`+ return Label("Legacy")`
	`33`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ import (`
`28`	`28`	`"github.com/deckhouse/virtualization/test/e2e/internal/config"`
`29`	`29`	`"github.com/deckhouse/virtualization/test/e2e/internal/framework"`
`30`	`30`	`kc "github.com/deckhouse/virtualization/test/e2e/internal/kubectl"`
	`31`	`+ "github.com/deckhouse/virtualization/test/e2e/internal/label"`
`31`	`32`	`"github.com/deckhouse/virtualization/test/e2e/internal/util"`
`32`	`33`	`)`
`33`	`34`
`@@ -36,7 +37,7 @@ const (`
`36`	`37`	`antiAffinityLabel = "anti-affinity"`
`37`	`38`	`)`
`38`	`39`
`39`		`-var _ = Describe("ComplexTest", Ordered, func() {`
	`40`	`+var _ = Describe("ComplexTest", Ordered, label.Legacy(), func() {`
`40`	`41`	`var (`
`41`	`42`	`testCaseLabel = map[string]string{"testcase": "complex-test"}`
`42`	`43`	`hasNoConsumerLabel = map[string]string{"hasNoConsumer": "complex-test"}`