From 94431c29b4a76f60ed468db2e951bba4f8ceaa8d Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Thu, 29 Aug 2024 14:21:53 +0200 Subject: [PATCH] cirrus: remove ginkgo-e2e.json artifact It is not used by anybody so we do not have to store these and can safe some time by not having to generate it even if it is just ~500ms. Signed-off-by: Paul Holzinger --- .cirrus.yml | 3 --- Makefile | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 9d28a7dec0..f48af47dfc 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -635,9 +635,6 @@ local_integration_test_task: &local_integration_test_task ginkgo_node_logs_artifacts: path: ./test/e2e/ginkgo-node-*.log type: text/plain - ginkgo_json_artifacts: - path: ./ginkgo-e2e.json - type: application/json # Nearly identical to `local_integration_test` except all operations diff --git a/Makefile b/Makefile index 65b5615bc8..db73caae6e 100644 --- a/Makefile +++ b/Makefile @@ -136,8 +136,6 @@ GINKGOTIMEOUT ?= -timeout=90m GINKGOWHAT ?= test/e2e/. GINKGO_PARALLEL=y GINKGO ?= ./test/tools/build/ginkgo -# ginkgo json output is only useful in CI, not on developer runs -GINKGO_JSON ?= $(if $(CI),--json-report ginkgo-e2e.json,) # Allow control over some Ginkgo parameters GINKGO_FLAKE_ATTEMPTS ?= 0 @@ -652,7 +650,7 @@ ginkgo-run: .install.ginkgo $(GINKGO) version $(GINKGO) -vv $(TESTFLAGS) --tags "$(TAGS) remote" $(GINKGOTIMEOUT) --flake-attempts $(GINKGO_FLAKE_ATTEMPTS) \ --trace $(if $(findstring y,$(GINKGO_NO_COLOR)),--no-color,) \ - $(GINKGO_JSON) $(if $(findstring y,$(GINKGO_PARALLEL)),-p,) $(if $(FOCUS),--focus "$(FOCUS)",) \ + $(if $(findstring y,$(GINKGO_PARALLEL)),-p,) $(if $(FOCUS),--focus "$(FOCUS)",) \ $(if $(FOCUS_FILE),--focus-file "$(FOCUS_FILE)",) $(GINKGOWHAT) .PHONY: ginkgo