Make it possible to opt out of junit (#950)

.circleci/config.yml

@@ -7,6 +7,7 @@ jobs:
     machine: true
     steps:
       - checkout
+      - run: echo 'export INTEGRATION_OUTPUT_JUNIT="true"' >> $BASH_ENV
       - run: ./test/run_tests.sh
       - store_test_results:
           path: reports/

Makefile

@@ -27,10 +27,7 @@ test:
 .PHONY: integration-test
 # Run integration tests
 integration-test: cli-fast
-	mkdir -p reports/
-	go get github.com/jstemmer/go-junit-report
-	go test -tags integration ./pkg/... ./cmd/... -v -mod=readonly -coverprofile cover-integration.out 2>&1 |tee /dev/fd/2 |go-junit-report -set-exit-code > reports/integration_report.xml
-	go run ./cmd/kubectl-kudo test 2>&1 |tee /dev/fd/2 |go-junit-report -set-exit-code > reports/kudo_test_report.xml
+	./hack/run-integration-tests.sh
 
 .PHONY: test-clean
 # Clean test reports

hack/run-integration-tests.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+INTEGRATION_OUTPUT_JUNIT=${INTEGRATION_OUTPUT_JUNIT:-false}
+
+if [ "$INTEGRATION_OUTPUT_JUNIT" == true ]
+then
+    echo "Running tests with junit output"
+    mkdir -p reports/
+    go get github.com/jstemmer/go-junit-report
+    go test -tags integration ./pkg/... ./cmd/... -v -mod=readonly -coverprofile cover-integration.out 2>&1 |tee /dev/fd/2 |go-junit-report -set-exit-code > reports/integration_report.xml
+    go run ./cmd/kubectl-kudo test 2>&1 |tee /dev/fd/2 |go-junit-report -set-exit-code > reports/kudo_test_report.xml
+else
+    echo "Running tests without junit output"
+    go test -tags integration ./pkg/... ./cmd/... -v -mod=readonly -coverprofile cover-integration.out
+    go run ./cmd/kubectl-kudo test
+fi

test/Dockerfile

@@ -7,6 +7,7 @@ RUN make download
 COPY config/ config/
 COPY pkg/ pkg/
 COPY cmd/ cmd/
+COPY hack/run-integration-tests.sh hack/run-integration-tests.sh
 COPY test/ test/
 COPY kudo-test.yaml kudo-test.yaml
 

test/run_tests.sh

@@ -4,6 +4,8 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+INTEGRATION_OUTPUT_JUNIT=${INTEGRATION_OUTPUT_JUNIT:-false}
+
 # Pull the builder image with retries if it doesn't already exist.
 retries=0
 builder_image=$(awk '/FROM/ {print $2}' test/Dockerfile)
@@ -21,7 +23,7 @@ if ! docker inspect "$builder_image"; then
 fi
 
 if docker build -f test/Dockerfile -t kudo-test .; then
-    if docker run -it -m 4g -v "$(pwd)"/reports:/go/src/github.com/kudobuilder/kudo/reports --rm kudo-test; then
+    if docker run -e INTEGRATION_OUTPUT_JUNIT -it -m 4g -v "$(pwd)"/reports:/go/src/github.com/kudobuilder/kudo/reports --rm kudo-test; then
         echo "Tests finished successfully! ヽ(•‿•)ノ"
     else
         exit $?