Skip to content

Commit

Permalink
test(e2e): avoid starting 2 k8s clusters in test/e2e-kubernetes (#8823)
Browse files Browse the repository at this point in the history
left over from #8736

Signed-off-by: Charly Molter <[email protected]>
  • Loading branch information
lahabana authored Jan 11, 2024
1 parent ccfcdb0 commit f52f45c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions mk/e2e.new.mk
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,11 @@ test/e2e: $(E2E_DEPS_TARGETS) $(E2E_K8S_BIN_DEPS) ## Run slower e2e tests (slowe
.PHONY: test/e2e-kubernetes
test/e2e-kubernetes: $(E2E_DEPS_TARGETS) $(E2E_K8S_BIN_DEPS) ## Run kubernetes e2e tests. Use DEBUG=1 to more easily find issues
$(MAKE) docker/tag
$(MAKE) test/e2e/k8s/start
$(MAKE) test/e2e/k8s/start/cluster/kuma-1
$(MAKE) test/e2e/k8s/wait/kuma-1
$(MAKE) test/e2e/k8s/load/images/kuma-1
$(E2E_ENV_VARS) $(GINKGO_TEST_E2E) $(KUBE_E2E_PKG_LIST) || (ret=$$?; $(MAKE) test/e2e/k8s/stop/cluster/kuma-1 && exit $$ret)
$(MAKE) test/e2e/k8s/stop
$(MAKE) test/e2e/k8s/stop/cluster/kuma-1

.PHONY: test/e2e-universal
test/e2e-universal: $(E2E_DEPS_TARGETS) $(E2E_UNIVERSAL_BIN_DEPS) k3d/network/create ## Run universal e2e tests. Use DEBUG=1 to more easily find issues
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/bootstrap/e2e_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ func TestE2E(t *testing.T) {
test.RunE2ESpecs(t, "Bootstrap Suite")
}

var _ = Describe("Corefile Template", bootstrap.CorefileTemplate, Ordered)
var _ = Describe("Corefile Template", Label("job-1"), bootstrap.CorefileTemplate, Ordered)

0 comments on commit f52f45c

Please sign in to comment.