opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-19 00:56:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from edsantiago/ginkgo_logs_optional

Browse Source 
ginkgo json output: only in CI, not on laptop runs
This commit is contained in:
OpenShift Merge Robot
2023-05-04 12:44:56 -04:00
committed by GitHub
parent d1a696acb7 0c070ebfbd
commit 071bc5c93e
1 changed files with 3 additions and 1 deletions

4
Makefile

@ -128,6 +128,8 @@ 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,)
# Conditional required to produce empty-output if binary not built yet.
RELEASE_VERSION = $(shell if test -x test/version/version; then test/version/version; fi)
@ -559,7 +561,7 @@ test: localunit localintegration remoteintegration localsystem remotesystem ##
.PHONY: ginkgo-run
ginkgo-run: .install.ginkgo
$(GINKGO) version
$(GINKGO) -vv $(TESTFLAGS) --tags "$(TAGS) remote" $(GINKGOTIMEOUT) --flake-attempts 3 --trace --no-color --json-report ginkgo-e2e.json $(if $(findstring y,$(GINKGO_PARALLEL)),-p,) $(GINKGOWHAT) $(HACK)
$(GINKGO) -vv $(TESTFLAGS) --tags "$(TAGS) remote" $(GINKGOTIMEOUT) --flake-attempts 3 --trace --no-color $(GINKGO_JSON) $(if $(findstring y,$(GINKGO_PARALLEL)),-p,) $(GINKGOWHAT) $(HACK)
.PHONY: ginkgo
ginkgo: