fix release tests

Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>

Author: universal-itengineer

test/e2e/release/current_release_smoke.go

@@ -89,32 +89,34 @@ func runPostUpgradeReleaseSmoke() {
 }
 
 func (t *currentReleaseSmokeTest) createResources() {
+	ctx := context.Background()
+
 	By("Creating root and hotplug virtual disks")
-	Expect(t.framework.CreateWithDeferredDeletion(context.Background(), t.diskObjects()...)).To(Succeed())
+	Expect(t.framework.CreateWithDeferredDeletion(ctx, t.diskObjects()...)).To(Succeed())
 
 	By("Creating virtual machines")
-	Expect(t.framework.CreateWithDeferredDeletion(context.Background(), t.vmObjects()...)).To(Succeed())
+	Expect(t.framework.CreateWithDeferredDeletion(ctx, t.vmObjects()...)).To(Succeed())
 	if runningVMs := t.initialRunningVMObjects(); len(runningVMs) > 0 {
-		util.UntilObjectPhase(string(v1alpha2.MachineRunning), framework.LongTimeout, runningVMs...)
+		util.UntilObjectPhase(ctx, string(v1alpha2.MachineRunning), framework.LongTimeout, runningVMs...)
 	}
 	if stoppedVMs := t.initialStoppedVMObjects(); len(stoppedVMs) > 0 {
-		util.UntilObjectPhase(string(v1alpha2.MachineStopped), framework.MiddleTimeout, stoppedVMs...)
+		util.UntilObjectPhase(ctx, string(v1alpha2.MachineStopped), framework.MiddleTimeout, stoppedVMs...)
 	}
 
 	By("Starting manual-policy virtual machines")
 	for _, vmScenario := range t.manualStartVMs() {
-		util.StartVirtualMachine(t.framework, vmScenario.vm)
+		util.StartVirtualMachine(ctx, t.framework, vmScenario.vm)
 	}
 	if startedVMs := t.manualStartVMObjects(); len(startedVMs) > 0 {
-		util.UntilObjectPhase(string(v1alpha2.MachineRunning), framework.LongTimeout, startedVMs...)
+		util.UntilObjectPhase(ctx, string(v1alpha2.MachineRunning), framework.LongTimeout, startedVMs...)
 	}
 
 	By("Attaching hotplug disks")
-	Expect(t.framework.CreateWithDeferredDeletion(context.Background(), t.attachmentObjects()...)).To(Succeed())
-	util.UntilObjectPhase(string(v1alpha2.BlockDeviceAttachmentPhaseAttached), framework.MaxTimeout, t.attachmentObjects()...)
+	Expect(t.framework.CreateWithDeferredDeletion(ctx, t.attachmentObjects()...)).To(Succeed())
+	util.UntilObjectPhase(ctx, string(v1alpha2.BlockDeviceAttachmentPhaseAttached), framework.MaxTimeout, t.attachmentObjects()...)
 
 	By("Waiting for all disks to become ready after consumers appear")
-	util.UntilObjectPhase(string(v1alpha2.DiskReady), framework.LongTimeout, t.diskObjects()...)
+	util.UntilObjectPhase(ctx, string(v1alpha2.DiskReady), framework.LongTimeout, t.diskObjects()...)
 }
 
 func (t *currentReleaseSmokeTest) verifyVMsReady() {
@@ -132,7 +134,7 @@ func (t *currentReleaseSmokeTest) verifyVMsReady() {
 
 func (t *currentReleaseSmokeTest) verifyVMsSurvivedUpgrade() {
 	By("Waiting for upgraded virtual machines to be running")
-	util.UntilObjectPhase(string(v1alpha2.MachineRunning), framework.LongTimeout, t.vmObjects()...)
+	util.UntilObjectPhase(context.Background(), string(v1alpha2.MachineRunning), framework.LongTimeout, t.vmObjects()...)
 
 	By("Checking guest access after module upgrade")
 	for _, vmScenario := range t.vms {

test/e2e/release/guest.go

@@ -33,8 +33,8 @@ import (
 )
 
 const (
-	lsblkJSONCommand    = "sudo lsblk --bytes --json --nodeps --output NAME,SIZE,TYPE,MOUNTPOINTS"
-	rootDiskNameCommand = `root_source=$(findmnt -no SOURCE /); root_disk=$(lsblk -ndo PKNAME "$root_source" 2>/dev/null | head -n1); if [ -n "$root_disk" ]; then echo "$root_disk"; else lsblk -ndo NAME "$root_source" | head -n1; fi`
+	lsblkJSONCommand     = "sudo lsblk --bytes --json --nodeps --output NAME,SIZE,TYPE,MOUNTPOINTS"
+	rootDiskNameCommand  = `root_source=$(findmnt -no SOURCE /); root_disk=$(lsblk -ndo PKNAME "$root_source" 2>/dev/null | head -n1); if [ -n "$root_disk" ]; then echo "$root_disk"; else lsblk -ndo NAME "$root_source" | head -n1; fi`
 	maxCloudInitDiskSize = int64(4 * 1024 * 1024)
 )
 
@@ -61,7 +61,7 @@ func (t *currentReleaseSmokeTest) expectGuestReady(vmScenario *vmScenario) {
 	}
 
 	By(fmt.Sprintf("Waiting for guest agent on %s", vm.Name))
-	util.UntilVMAgentReady(crclient.ObjectKeyFromObject(vm), framework.LongTimeout)
+	util.UntilVMAgentReady(context.Background(), crclient.ObjectKeyFromObject(vm), framework.LongTimeout)
 }
 
 func (t *currentReleaseSmokeTest) expectAdditionalDiskCount(vm *v1alpha2.VirtualMachine, expectedCount int) {

test/e2e/release/release_suite_test.go

@@ -18,24 +18,18 @@ package release
 
 import (
 	"context"
-	"fmt"
 	"testing"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 	"github.com/deckhouse/virtualization/test/e2e/controller"
-	"github.com/deckhouse/virtualization/test/e2e/internal/config"
 	"github.com/deckhouse/virtualization/test/e2e/internal/framework"
-	"github.com/deckhouse/virtualization/test/e2e/internal/precreatedcvi"
-	"github.com/deckhouse/virtualization/test/e2e/internal/util"
+	"github.com/deckhouse/virtualization/test/e2e/internal/precheck"
 )
 
-var cviManager = precreatedcvi.NewManager()
-
 func TestRelease(t *testing.T) {
 	log.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
 	RegisterFailHandler(Fail)
@@ -45,23 +39,11 @@ func TestRelease(t *testing.T) {
 var _ = SynchronizedBeforeSuite(func() {
 	controller.NewBeforeProcess1Body()
 
-	By("Creating or reusing precreated CVIs")
-	err := cviManager.Bootstrap(context.Background())
-	Expect(err).NotTo(HaveOccurred())
-
-	cvis := cviManager.CVIsAsObjects()
-	By(fmt.Sprintf("Waiting for all %d precreated CVIs to be ready", len(cvis)))
-	util.UntilObjectPhase(string(v1alpha2.ImageReady), framework.LongTimeout, cvis...)
+	precheck.Run(framework.NewFramework(""), GinkgoLabelFilter())
 }, func() {})
 
 var _ = SynchronizedAfterSuite(func() {
-	if !config.IsCleanUpNeeded() || !config.IsPrecreatedCVICleanupNeeded() {
-		return
-	}
-
-	By("Cleaning up precreated CVIs")
-	err := cviManager.Cleanup(context.Background())
-	Expect(err).NotTo(HaveOccurred(), "Failed to delete precreated CVIs")
+	precheck.CleanupPrecreatedCVIs(context.Background(), framework.NewFramework(""))
 }, func() {
 	controller.NewAfterAllProcessBody()
 })