From 69fc4f65f95f06b817582926e7b1e9cacaf617c3 Mon Sep 17 00:00:00 2001 From: Charly Molter Date: Thu, 11 Jan 2024 17:43:10 +0100 Subject: [PATCH] test(e2e): avoid starting 2 k8s clusters in test/e2e-kubernetes left over from https://github.com/kumahq/kuma/pull/8736 Signed-off-by: Charly Molter --- mk/e2e.new.mk | 6 ++++-- test/e2e/bootstrap/e2e_suite_test.go | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mk/e2e.new.mk b/mk/e2e.new.mk index c7000b14d0f4..7f3562d0bd80 100644 --- a/mk/e2e.new.mk +++ b/mk/e2e.new.mk @@ -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 diff --git a/test/e2e/bootstrap/e2e_suite_test.go b/test/e2e/bootstrap/e2e_suite_test.go index 1c7cef5e3fe3..b71fbe40e82e 100644 --- a/test/e2e/bootstrap/e2e_suite_test.go +++ b/test/e2e/bootstrap/e2e_suite_test.go @@ -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)