CLOUDP-349099: Fix labels (#2865)

* Remove e2e_local.sh

* Re-surface reconcile test labels

* Re-surface helm-ns label, but focus entry labels

* Detach AtlasDeploymentSharding from AtlasDeployment

Signed-off-by: jose.vazquez <jose.vazquez@mongodb.com>

---------

Signed-off-by: jose.vazquez <jose.vazquez@mongodb.com>

Author: josvazg

.github/workflows/test-int.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test: ["AtlasProject", "AtlasDeployment && !AtlasDeploymentSharding", "AtlasDatabaseUser", "AtlasDataFederation", "AtlasFederatedAuth", "AtlasDeploymentSharding", "AtlasStreams"]
+        test: ["AtlasProject", "AtlasDeployment", "AtlasDatabaseUser", "AtlasDataFederation", "AtlasFederatedAuth", "AtlasDeploymentSharding", "AtlasStreams"]
         target: [ "test/int" ]
         nodes: [12]
         include:

Makefile

@@ -115,11 +115,11 @@ KUBEBUILDER_ASSETS ?= $(ENVTEST_ASSETS_DIR)/k8s/$(ENVTEST_K8S_VERSION)-$(TARGET_
 GINKGO_NODES ?= 12
 GINKGO_EDITOR_INTEGRATION ?= true
 GINKGO_OPTS = -vv --randomize-all --output-interceptor-mode=none --trace --timeout 90m --race --nodes=$(GINKGO_NODES) --cover --coverpkg=github.com/mongodb/mongodb-atlas-kubernetes/v2/... --coverprofile=coverprofile.out
-GINKGO_FILTER_LABEL ?=
+GINKGO_FILTER_LABEL ?= $(label)
 ifneq ($(GINKGO_FILTER_LABEL),)
 GINKGO_FILTER_LABEL_OPT := --label-filter="$(GINKGO_FILTER_LABEL)"
 endif
-GINKGO=ginkgo run $(GINKGO_OPTS) $(GINKGO_FILTER_LABEL_OPT) $(shell pwd)/$@
+GINKGO=ginkgo run $(GINKGO_OPTS) $(GINKGO_FILTER_LABEL_OPT)
 
 BASE_GO_PACKAGE = github.com/mongodb/mongodb-atlas-kubernetes/v2
 GO_LICENSES = go-licenses
@@ -233,10 +233,10 @@ unit-test: manifests
 
 ## Run integration tests. Sample with labels: `make test/int GINKGO_FILTER_LABEL=AtlasProject`
 test/int: envtest manifests
-	AKO_INT_TEST=1 KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS) $(GINKGO)
+	AKO_INT_TEST=1 KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS) $(GINKGO) $(shell pwd)/$@
 
 test/int/clusterwide: envtest manifests
-	AKO_INT_TEST=1 KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS) $(GINKGO)
+	AKO_INT_TEST=1 KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS) $(GINKGO) $(shell pwd)/$@
 
 envtest: envtest-assets
 	KUBEBUILDER_ASSETS=$(shell setup-envtest use $(ENVTEST_K8S_VERSION) --bin-dir $(ENVTEST_ASSETS_DIR) -p path)
@@ -246,8 +246,8 @@ envtest-assets:
 	mkdir -p $(ENVTEST_ASSETS_DIR)
 
 .PHONY: e2e
-e2e: bundle run-kind ## Run e2e test. Command `make e2e label=cluster-ns` run cluster-ns test
-	./scripts/e2e_local.sh $(label) $(build)
+e2e: bundle manifests run-kind ## Run e2e test. Command `make e2e label=cluster-ns` run cluster-ns test
+	AKO_E2E_TEST=1 $(GINKGO) $(shell pwd)/test/$@
 
 .PHONY: e2e2
 e2e2: run-kind manager install-credentials install-crds set-namespace ## Run e2e2 tests. Command `make e2e2 label=integrations-ctlr` run integrations-ctlr e2e2 test

scripts/e2e_local.sh

@@ -240,19 +240,19 @@ var _ = Describe("Reconciles test:", func() {
 			})
 		},
 
-		Entry("All namespaces when no namespace config is set", Label("focus-reconcile-all"), &tc{
+		Entry("All namespaces when no namespace config is set", Label("reconcile-all"), &tc{
 			namespaces:      []string{"ns1", "ns2", "ns3"},
 			watchNamespaces: nil,
 			wantToFind:      []string{"ns1", "ns2", "ns3"},
 		}),
 
-		Entry("One namespace when only one namespace is configured", Label("focus-reconcile-one"), &tc{
+		Entry("One namespace when only one namespace is configured", Label("reconcile-one"), &tc{
 			namespaces:      []string{"ns1", "ns2", "ns3"},
 			watchNamespaces: []string{"ns1"},
 			wantToFind:      []string{"ns1"},
 		}),
 
-		Entry("Two namespaces when only those two are configured", Label("focus-reconcile-two"), &tc{
+		Entry("Two namespaces when only those two are configured", Label("reconcile-two"), &tc{
 			namespaces:      []string{"ns1", "ns2", "ns3"},
 			watchNamespaces: []string{"ns1", "ns2"},
 			wantToFind:      []string{"ns1", "ns2"},

test/e2e/cache_watch_test.go

@@ -99,7 +99,7 @@ var _ = Describe("HELM charts", Ordered, FlakeAttempts(2), func() {
 		})
 	})
 
-	DescribeTable("Namespaced operators working only with its own namespace with different configuration", Label("focus-helm-ns"),
+	DescribeTable("Namespaced operators working only with its own namespace with different configuration", Label("helm-ns"),
 		func(test model.TestDataProvider, deploymentType string) { // deploymentType - probably will be moved later ()
 			data = test
 			GinkgoWriter.Println(data.Resources.KeyName)
@@ -128,7 +128,7 @@ var _ = Describe("HELM charts", Ordered, FlakeAttempts(2), func() {
 			})
 			deleteDeploymentAndOperator(&data)
 		},
-		Entry("Several actions with helm update", Label("helm-ns-flow"),
+		Entry("Several actions with helm update", Label("focus-helm-ns-flow"),
 			model.DataProviderWithResources(
 				"helm-ns",
 				model.AProject{},
@@ -150,7 +150,7 @@ var _ = Describe("HELM charts", Ordered, FlakeAttempts(2), func() {
 			),
 			"flex",
 		),
-		Entry("Deployment multiregion by helm chart", Label("helm-advanced-multiregion"),
+		Entry("Deployment multiregion by helm chart", Label("focus-helm-advanced-multiregion"),
 			model.DataProviderWithResources(
 				"helm-advanced-multiregion",
 				model.AProject{},
@@ -168,7 +168,7 @@ var _ = Describe("HELM charts", Ordered, FlakeAttempts(2), func() {
 			),
 			"advanced",
 		),
-		Entry("Flex deployment by helm chart", Label("helm-flex"),
+		Entry("Flex deployment by helm chart", Label("focus-helm-flex"),
 			model.DataProviderWithResources(
 				"helm-flex",
 				model.AProject{},