Skip to content

Commit b6c9e53

Browse files
UPSTREAM: <carry>: [Default Catalog Consistency Test]: fix junit output format to allow generate xml
1 parent 694e8d7 commit b6c9e53

File tree

1 file changed

+15
-3
lines changed
  • openshift/default-catalog-consistency

1 file changed

+15
-3
lines changed

openshift/default-catalog-consistency/Makefile

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,22 @@ help: #HELP Display essential help.
2323

2424
#SECTION Tests
2525

26+
# Set the Ginkgo binary path. Assumes it's installed via `go install`
27+
GOBIN ?= $(shell go env GOBIN)
28+
ifeq ($(GOBIN),)
29+
GOBIN := $(shell go env GOPATH)/bin
30+
endif
31+
32+
GINKGO := $(GOBIN)/ginkgo
33+
34+
$(GINKGO):
35+
go install github.com/onsi/ginkgo/v2/[email protected]
36+
2637
.PHONY: test-catalog
27-
test-catalog: #HELP Run the set of tests to validate the quality of catalogs
28-
E2E_GINKGO_OPTS="$(if $(ARTIFACT_DIR),--output-dir='$(ARTIFACT_DIR)') --junit-report junit_e2e.xml" \
29-
go test -count=1 -v ./test/validate/...;
38+
test-catalog: $(GINKGO) #HELP Run the set of tests to validate the quality of catalogs
39+
$(GINKGO) $(if $(ARTIFACT_DIR),--output-dir='$(ARTIFACT_DIR)') \
40+
--junit-report=junit_olm.xml ./test/validate/...
41+
3042

3143
#SECTION Development
3244

0 commit comments

Comments
 (0)