From 70021820729d7ae0bbdaf4c98b2b4ed615bbeedf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 7 Nov 2022 11:06:00 +0800 Subject: [PATCH] [Backport release-1.6] Fix: remove duplicate mock server in CI (#5012) * Fix: not killing mock server process every time Signed-off-by: qiaozp (cherry picked from commit abb13b9ab438ad143c0ff5d06eb1845e5f54fe0e) * remove redundent mock server Signed-off-by: qiaozp (cherry picked from commit b1672d1bf3e6e71f531e4a41d853ef28e9f50a5f) Co-authored-by: qiaozp --- makefiles/e2e.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/makefiles/e2e.mk b/makefiles/e2e.mk index 7e0d91968..6d38ead21 100644 --- a/makefiles/e2e.mk +++ b/makefiles/e2e.mk @@ -6,8 +6,8 @@ e2e-setup-core-pre-hook: e2e-setup-core-post-hook: kubectl wait --for=condition=Available deployment/kubevela-vela-core -n vela-system --timeout=180s helm install kruise https://github.com/openkruise/charts/releases/download/kruise-1.1.0/kruise-1.1.0.tgz --set featureGates="PreDownloadImageForInPlaceUpdate=true" --set daemon.socketLocation=/run/k3s/containerd/ + kill -9 $(lsof -it:9098) || true go run ./e2e/addon/mock & - sleep 15 bin/vela addon enable ./e2e/addon/mock/testdata/fluxcd bin/vela addon enable ./e2e/addon/mock/testdata/rollout bin/vela addon enable ./e2e/addon/mock/testdata/terraform @@ -82,14 +82,9 @@ e2e-api-test: ginkgo -v -skipPackage capability,setup,application -r e2e ginkgo -v -r e2e/application -ADDONSERVER = $(shell pgrep vela_addon_mock_server) - .PHONY: e2e-apiserver-test e2e-apiserver-test: - pkill vela_addon_mock_server || true - go run ./e2e/addon/mock/vela_addon_mock_server.go & - sleep 15 go test -v -coverpkg=./... -coverprofile=/tmp/e2e_apiserver_test.out ./test/e2e-apiserver-test @$(OK) tests pass