feat: add both labels

Author: vknabel

test/e2e/frmwrk/cluster_basic_test.go

@@ -37,7 +37,7 @@ var _ = Describe("Basic Cluster", Ordered, Label("basic"), func() {
 				done()
 			})
 
-			It("create new cluster", Label("create"), func() {
+			It("create new cluster", Label("basic", "create"), func() {
 				ec = createE2ECluster(ctx, e2eCtx, ClusterConfig{
 					SpecName:                 "basic-cluster-creation-" + v,
 					NamespaceName:            fmt.Sprintf("basic-%d", i),
@@ -51,7 +51,7 @@ var _ = Describe("Basic Cluster", Ordered, Label("basic"), func() {
 				Expect(ec).ToNot(BeNil())
 			})
 
-			It("move from bootstrap to workload cluster", Label("move"), func() {
+			It("move from bootstrap to workload cluster", Label("basic", "move"), func() {
 				Expect(ec).NotTo(BeNil(), "e2e cluster required")
 
 				clusterctl.InitManagementClusterAndWatchControllerLogs(ctx, clusterctl.InitManagementClusterAndWatchControllerLogsInput{
@@ -84,7 +84,7 @@ var _ = Describe("Basic Cluster", Ordered, Label("basic"), func() {
 				Expect(err).ToNot(HaveOccurred(), "cluster should be present")
 			})
 
-			It("move from workload to bootstrap cluster", Label("move"), func() {
+			It("move from workload to bootstrap cluster", Label("basic", "move"), func() {
 				Expect(ec).NotTo(BeNil(), "e2e cluster required")
 
 				clusterctl.Move(ctx, clusterctl.MoveInput{
@@ -110,7 +110,7 @@ var _ = Describe("Basic Cluster", Ordered, Label("basic"), func() {
 				Expect(err).ToNot(HaveOccurred(), "cluster should be present")
 			})
 
-			It("delete cluster", Label("teardown"), func() {
+			It("delete cluster", Label("basic", "teardown"), func() {
 				ec.Teardown(ctx)
 			})
 		})

test/e2e/frmwrk/cluster_ha_test.go

@@ -31,7 +31,7 @@ var _ = Describe("High Availability Cluster", Ordered, Label("ha"), func() {
 				done()
 			})
 
-			It("create new cluster", Label("create"), func() {
+			It("create new cluster", Label("ha", "create"), func() {
 				ec = createE2ECluster(ctx, e2eCtx, ClusterConfig{
 					SpecName:                 "ha-cluster-creation-" + v,
 					NamespaceName:            fmt.Sprintf("ha-%d", i),
@@ -45,7 +45,10 @@ var _ = Describe("High Availability Cluster", Ordered, Label("ha"), func() {
 				Expect(ec).ToNot(BeNil())
 			})
 
-			It("delete cluster", Label("teardown"), func() {
+			It("delete cluster", Label("ha", "teardown"), func() {
+				if ec == nil {
+					Skip("E2ECluster not initialized, skipping teardown")
+				}
 				ec.Teardown(ctx)
 			})
 		})

test/e2e/frmwrk/frmwrk_suite_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/onsi/ginkgo/v2"
+	ginkgotypes "github.com/onsi/ginkgo/v2/types"
 	. "github.com/onsi/gomega"
 
 	"k8s.io/klog/v2"
@@ -36,6 +37,12 @@ var _ = ginkgo.AfterSuite(func() {
 		return
 	}
 	if e2eCtx != nil {
+		filter, err := ginkgotypes.ParseLabelFilter(ginkgo.GinkgoLabelFilter())
+		Expect(err).ToNot(HaveOccurred(), "failed to parse ginkgo label filter")
+
+		if !filter([]string{"teardown"}) {
+			return
+		}
 		e2eCtx.Teardown(context.TODO())
 	}
 })

test/e2e/frmwrk/shared_cases.go

@@ -19,19 +19,22 @@ func createE2ECluster(ctx context.Context, e2eCtx *E2EContext, cfg ClusterConfig
 	ec.SetupNamespace(ctx)
 	ec.GenerateAndApplyClusterTemplate(ctx)
 
-	By("Wait for cluster")
-	controlPlane := framework.GetKubeadmControlPlaneByCluster(ctx, framework.GetKubeadmControlPlaneByClusterInput{
-		Lister:      e2eCtx.Environment.Bootstrap.GetClient(),
-		ClusterName: ec.Refs.Cluster.Name,
-		Namespace:   ec.Refs.Cluster.Namespace,
+	DeferCleanup(func() {
+		ec.Dump(context.Background())
 	})
 
+	By("Wait for cluster")
 	framework.DiscoveryAndWaitForCluster(ctx, framework.DiscoveryAndWaitForClusterInput{
 		Getter:    e2eCtx.Environment.Bootstrap.GetClient(),
 		Namespace: ec.Refs.Cluster.Namespace,
 		Name:      ec.Refs.Cluster.Name,
 	}, e2eCtx.E2EConfig.GetIntervals("default", "wait-cluster")...)
 
+	controlPlane := framework.GetKubeadmControlPlaneByCluster(ctx, framework.GetKubeadmControlPlaneByClusterInput{
+		Lister:      e2eCtx.Environment.Bootstrap.GetClient(),
+		ClusterName: ec.Refs.Cluster.Name,
+		Namespace:   ec.Refs.Cluster.Namespace,
+	})
 	Expect(controlPlane).To(Not(BeNil()))
 
 	By("Wait for CNI and CCM")
@@ -59,6 +62,17 @@ func createE2ECluster(ctx context.Context, e2eCtx *E2EContext, cfg ClusterConfig
 		Getter:  e2eCtx.Environment.Bootstrap.GetClient(),
 	}, e2eCtx.E2EConfig.GetIntervals("default", "wait-cluster-provisioned")...)
 
-	ec.Dump(ctx)
+	framework.WaitForOneKubeadmControlPlaneMachineToExist(ctx, framework.WaitForOneKubeadmControlPlaneMachineToExistInput{
+		Lister:       e2eCtx.Environment.Bootstrap.GetClient(),
+		Cluster:      ec.Refs.Cluster,
+		ControlPlane: controlPlane,
+	}, e2eCtx.E2EConfig.GetIntervals("default", "wait-control-plane-machine")...)
+
+	framework.WaitForControlPlaneAndMachinesReady(ctx, framework.WaitForControlPlaneAndMachinesReadyInput{
+		Cluster:      ec.Refs.Cluster,
+		GetLister:    e2eCtx.Environment.Bootstrap.GetClient(),
+		ControlPlane: controlPlane,
+	}, e2eCtx.E2EConfig.GetIntervals("default", "wait-control-plane-and-machines-ready")...)
+
 	return ec
 }