test: correct subset of tests

Author: vknabel

Makefile

@@ -89,7 +89,7 @@ vet: ## Run go vet against code.
 
 .PHONY: test
 test: manifests generate update-test-crds fmt vet envtest ginkgo ## Run tests.
-	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" $(GINKGO) -r --junit-report="junit.e2e_suite.xml" --cover -- $$(go list ./... | grep -v /e2e) -coverprofile cover.out
+	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" $(GINKGO) -r --junit-report="junit.e2e_suite.xml" --cover -coverprofile cover.out $$(go list ./... | grep -v /e2e | sed "s|github.com/metal-stack/cluster-api-provider-metal-stack|.|")
 
 # The default setup assumes Kind is pre-installed and builds/loads the Manager Docker image locally.
 # Prometheus and CertManager are installed by default; skip with:
@@ -145,7 +145,7 @@ test-e2e: manifests generate fmt vet ginkgo
 	FIREWALL_SIZE=$(E2E_FIREWALL_SIZE) \
 	FIREWALL_NETWORKS=$(E2E_FIREWALL_NETWORKS) \
 	ARTIFACTS=$(ARTIFACTS) \
-	$(GINKGO) --tags=integration -vv -r --junit-report="junit.e2e_suite.xml" --output-dir="$(ARTIFACTS)" -timeout 60m ./test/e2e/frmwrk 
+	$(GINKGO) -vv -r --junit-report="junit.e2e_suite.xml" --output-dir="$(ARTIFACTS)" -timeout 60m ./test/e2e/frmwrk 
 
 .PHONY: lint
 lint: golangci-lint ## Run golangci-lint linter

test/e2e/frmwrk/bootstrap_test.go

@@ -1,6 +1,3 @@
-//go:build integration
-// +build integration
-
 package frmwrk
 
 import (
@@ -66,16 +63,10 @@ func createE2ECluster(ctx context.Context, e2eCtx *E2EContext, cfg ClusterConfig
 	ec.GenerateAndApplyClusterTemplate(ctx)
 
 	By("Wait for cluster")
-	cluster := framework.DiscoveryAndWaitForCluster(ctx, framework.DiscoveryAndWaitForClusterInput{
-		Namespace: ec.NamespaceName,
-		Name:      ec.ClusterName,
-		Getter:    e2eCtx.Environment.Bootstrap.GetClient(),
-	}, e2eCtx.E2EConfig.GetIntervals("default", "wait-cluster")...)
-
 	controlPlane := framework.GetKubeadmControlPlaneByCluster(ctx, framework.GetKubeadmControlPlaneByClusterInput{
 		Lister:      e2eCtx.Environment.Bootstrap.GetClient(),
-		ClusterName: cluster.Name,
-		Namespace:   cluster.Namespace,
+		ClusterName: ec.Refs.Cluster.Name,
+		Namespace:   ec.Refs.Cluster.Namespace,
 	})
 
 	Expect(controlPlane).To(Not(BeNil()))
@@ -97,11 +88,11 @@ func createE2ECluster(ctx context.Context, e2eCtx *E2EContext, cfg ClusterConfig
 	By("Wait for kubeadm control plane")
 	framework.DiscoveryAndWaitForControlPlaneInitialized(ctx, framework.DiscoveryAndWaitForControlPlaneInitializedInput{
 		Lister:  e2eCtx.Environment.Bootstrap.GetClient(),
-		Cluster: cluster,
+		Cluster: ec.Refs.Cluster,
 	}, e2eCtx.E2EConfig.GetIntervals("default", "wait-control-plane")...)
 
 	framework.WaitForClusterToProvision(ctx, framework.WaitForClusterToProvisionInput{
-		Cluster: cluster,
+		Cluster: ec.Refs.Cluster,
 		Getter:  e2eCtx.Environment.Bootstrap.GetClient(),
 	}, e2eCtx.E2EConfig.GetIntervals("default", "wait-cluster-provisioned")...)
 	return ec

test/e2e/frmwrk/frmwrk_suite_test.go

@@ -1,6 +1,3 @@
-//go:build integration
-// +build integration
-
 package frmwrk
 
 import (

test/e2e/frmwrk/shared.go

@@ -1,6 +1,3 @@
-//go:build integration
-// +build integration
-
 package frmwrk
 
 import (