Skip to content

Commit 079ff72

Browse files
committed
ensure that test output is being captured
./hack/test-with-junit.sh appears to be eating the output from go test. For now, it is probably better to remove the calls to that script since some of the test suites are failing and no output is visible.
1 parent 5dcc44a commit 079ff72

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -186,20 +186,20 @@ verify-e2e: $(patsubst %,_verify-e2e-%,$(E2E_SUITES))
186186

187187
# This was copied from https://github.com/openshift/cluster-image-registry-operator
188188
test-e2e: install-go-junit-report
189-
set -o pipefail; go test -tags=$(GOTAGS) -failfast -timeout 190m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e/ ./test/e2e-techpreview-shared/ | ./hack/test-with-junit.sh $(@)
189+
set -o pipefail; go test -tags=$(GOTAGS) -failfast -timeout 190m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e/ ./test/e2e-techpreview-shared/
190190

191191
test-e2e-techpreview: install-go-junit-report
192-
set -o pipefail; go test -tags=$(GOTAGS) -failfast -timeout 170m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e-techpreview ./test/e2e-techpreview-shared/ | ./hack/test-with-junit.sh $(@)
192+
set -o pipefail; go test -tags=$(GOTAGS) -failfast -timeout 170m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e-techpreview ./test/e2e-techpreview-shared/
193193

194194
test-e2e-single-node: install-go-junit-report
195-
set -o pipefail; go test -tags=$(GOTAGS) -failfast -timeout 120m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e-single-node/ | ./hack/test-with-junit.sh $(@)
195+
set -o pipefail; go test -tags=$(GOTAGS) -failfast -timeout 120m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e-single-node/
196196

197197
test-e2e-ocl: install-go-junit-report
198-
set -o pipefail; go test -tags=$(GOTAGS) -failfast -timeout 120m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e-ocl/ | ./hack/test-with-junit.sh $(@)
198+
set -o pipefail; go test -tags=$(GOTAGS) -failfast -timeout 120m -v$${WHAT:+ -run="$$WHAT"} ./test/e2e-ocl/
199199

200200
bootstrap-e2e: install-go-junit-report install-setup-envtest
201201
@echo "Setting up KUBEBUILDER_ASSETS"
202202
@KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --index https://raw.githubusercontent.com/openshift/api/master/envtest-releases.yaml --bin-dir $(PROJECT_DIR)/bin -p path)" && \
203203
echo "KUBEBUILDER_ASSETS=$$KUBEBUILDER_ASSETS" && \
204204
set -o pipefail && \
205-
KUBEBUILDER_ASSETS=$$KUBEBUILDER_ASSETS go test -tags=$(GOTAGS) -v$${WHAT:+ -run="$$WHAT"} ./test/e2e-bootstrap/ | ./hack/test-with-junit.sh $(@)
205+
KUBEBUILDER_ASSETS=$$KUBEBUILDER_ASSETS go test -tags=$(GOTAGS) -v$${WHAT:+ -run="$$WHAT"} ./test/e2e-bootstrap/

0 commit comments

Comments
 (0)