Skip to content

Commit 20b2db2

Browse files
committed
Remove e2e_local.sh
1 parent bfa5aa8 commit 20b2db2

File tree

2 files changed

+6
-64
lines changed

2 files changed

+6
-64
lines changed

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,11 @@ KUBEBUILDER_ASSETS ?= $(ENVTEST_ASSETS_DIR)/k8s/$(ENVTEST_K8S_VERSION)-$(TARGET_
115115
GINKGO_NODES ?= 12
116116
GINKGO_EDITOR_INTEGRATION ?= true
117117
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
118-
GINKGO_FILTER_LABEL ?=
118+
GINKGO_FILTER_LABEL ?= $(label)
119119
ifneq ($(GINKGO_FILTER_LABEL),)
120120
GINKGO_FILTER_LABEL_OPT := --label-filter="$(GINKGO_FILTER_LABEL)"
121121
endif
122-
GINKGO=ginkgo run $(GINKGO_OPTS) $(GINKGO_FILTER_LABEL_OPT) $(shell pwd)/$@
122+
GINKGO=ginkgo run $(GINKGO_OPTS) $(GINKGO_FILTER_LABEL_OPT)
123123

124124
BASE_GO_PACKAGE = github.com/mongodb/mongodb-atlas-kubernetes/v2
125125
GO_LICENSES = go-licenses
@@ -233,10 +233,10 @@ unit-test: manifests
233233

234234
## Run integration tests. Sample with labels: `make test/int GINKGO_FILTER_LABEL=AtlasProject`
235235
test/int: envtest manifests
236-
AKO_INT_TEST=1 KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS) $(GINKGO)
236+
AKO_INT_TEST=1 KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS) $(GINKGO) $(shell pwd)/$@
237237

238238
test/int/clusterwide: envtest manifests
239-
AKO_INT_TEST=1 KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS) $(GINKGO)
239+
AKO_INT_TEST=1 KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS) $(GINKGO) $(shell pwd)/$@
240240

241241
envtest: envtest-assets
242242
KUBEBUILDER_ASSETS=$(shell setup-envtest use $(ENVTEST_K8S_VERSION) --bin-dir $(ENVTEST_ASSETS_DIR) -p path)
@@ -246,8 +246,8 @@ envtest-assets:
246246
mkdir -p $(ENVTEST_ASSETS_DIR)
247247

248248
.PHONY: e2e
249-
e2e: bundle run-kind ## Run e2e test. Command `make e2e label=cluster-ns` run cluster-ns test
250-
./scripts/e2e_local.sh $(label) $(build)
249+
e2e: bundle manifests run-kind ## Run e2e test. Command `make e2e label=cluster-ns` run cluster-ns test
250+
AKO_E2E_TEST=1 $(GINKGO) $(shell pwd)/test/$@
251251

252252
.PHONY: e2e2
253253
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

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)