Merge pull request #974 from jhadvig/junit

CONSOLE-4481: Add junit generation for unit and e2e testing

Author: openshift-merge-bot[bot]

Makefile

@@ -3,7 +3,6 @@ all: build
 
 # Include the library makefile
 include $(addprefix ./vendor/github.com/openshift/build-machinery-go/make/, \
-    golang.mk \
     targets/openshift/deps-gomod.mk \
     targets/openshift/images.mk \
     targets/openshift/bindata.mk \
@@ -36,18 +35,29 @@ $(call build-image,ocp-console-operator,$(IMAGE_REGISTRY)/ocp/4.5:console-operat
 # $3 - manifests directory
 $(call add-profile-manifests,manifests,./profile-patches,./manifests)
 
-GO_TEST_PACKAGES :=./pkg/... ./cmd/...
+GO_UNIT_TEST_PACKAGES :=./pkg/... ./cmd/...
 
+# Run tests
 test: test-unit test-e2e
-.PHONY: test
 
-test-unit:
+test-unit: install-go-junit-report
+	./test-unit.sh PKG=$(GO_UNIT_TEST_PACKAGES)
 .PHONY: test-unit
 
-test-e2e:
-	KUBERNETES_CONFIG=${KUBECONFIG} go test -timeout 30m -v ./test/e2e/
+test-e2e: install-go-junit-report
+	./test-e2e.sh
 .PHONY: test-e2e
 
+# Automatically install go-junit-report if not found
+GO_JUNIT_REPORT := $(shell command -v go-junit-report 2> /dev/null)
+install-go-junit-report:
+ifndef GO_JUNIT_REPORT
+	@echo "Installing go-junit-report..."
+	go install -mod= github.com/jstemmer/go-junit-report@latest
+else
+	@echo "go-junit-report already installed."
+	go-junit-report --version
+endif
 
 # Remove all build artifacts.
 #

test-e2e.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+set -e
+
+ARTIFACT_DIR=${ARTIFACT_DIR:=/tmp/artifacts}
+
+# https://ci-operator-configresolver-ui-ci.apps.ci.l2s4.p1.openshiftapps.com/help#env
+OPENSHIFT_CI=${OPENSHIFT_CI:=false}
+
+echo "Running tests..."
+if [ "$OPENSHIFT_CI" = true ]; then
+    KUBERNETES_CONFIG=${KUBECONFIG} go test -timeout 30m -v ./test/e2e/ 2>&1 | tee "$ARTIFACT_DIR/test.out"
+    RESULT="${PIPESTATUS[0]}"
+    go-junit-report < "$ARTIFACT_DIR/test.out" > "$ARTIFACT_DIR/junit.xml"
+    if [ "$RESULT" -ne 0 ]; then
+        exit 255
+    fi
+else
+	echo 'KUBERNETES_CONFIG=${KUBECONFIG} go test -timeout 30m -v ./test/e2e/'
+    KUBERNETES_CONFIG=${KUBECONFIG} go test -timeout 30m -v ./test/e2e/
+fi
+
+echo "Success"

test-unit.sh

@@ -0,0 +1,77 @@
+#!/usr/bin/env bash
+
+set -e
+
+#
+# Run all tests (not including functional)
+#   ./test-.sh
+#   ./test-unit.sh -v
+#
+# Run tests for one package
+#   PKG=./unit ./test-unit.sh
+#   PKG=ssh ./test-unit.sh
+#
+
+ARTIFACT_DIR=${ARTIFACT_DIR:=/tmp/artifacts}
+
+export GOBIN=${PWD}/bin:${GOBIN}
+
+# Use deps from vendor dir.
+export GOFLAGS="-mod=vendor"
+
+# Invoke ./cover for HTML output
+COVER=${COVER:-"-cover"}
+
+# https://ci-operator-configresolver-ui-ci.apps.ci.l2s4.p1.openshiftapps.com/help#env
+OPENSHIFT_CI=${OPENSHIFT_CI:=false}
+
+TESTABLE="./pkg/... ./cmd/..."
+FORMATTABLE=(cmd pkg)
+
+# user has not provided PKG override
+if [ -z "${PKG}" ]; then
+	TEST=${TESTABLE}
+	FMT=("${FORMATTABLE[@]}")
+
+# user has provided PKG override
+else
+	# strip out slashes and dots from PKG=./foo/
+	TEST=${PKG//\//}
+	TEST=${TEST//./}
+
+	# only run gofmt on packages provided by user
+	FMT=("${TEST[@]}")
+fi
+
+# split TEST into an array and prepend repo path to each local package
+read -ra split <<<"$TEST"
+TEST=("${split[@]/#/github.com/openshift/console-operator/}")
+
+echo "Running tests..."
+if [ "$OPENSHIFT_CI" = true ]; then
+    go test -v "${COVER}" "$@" "${TEST[@]}" 2>&1 | tee "$ARTIFACT_DIR/test.out"
+    RESULT="${PIPESTATUS[0]}"
+    go-junit-report < "$ARTIFACT_DIR/test.out" > "$ARTIFACT_DIR/junit.xml"
+    if [ "$RESULT" -ne 0 ]; then
+        exit 255
+    fi
+else
+	echo "go test "${COVER}" "$@" "${TEST[@]}""
+    go test "${COVER}" "${TEST[@]}"
+fi
+
+echo "Checking gofmt..."
+fmtRes=$(gofmt -l "${FMT[@]}")
+if [ -n "${fmtRes}" ]; then
+	echo -e "gofmt checking failed:\n${fmtRes}"
+	exit 255
+fi
+
+echo "Checking govet..."
+vetRes=$(go vet "${TEST[@]}")
+if [ -n "${vetRes}" ]; then
+	echo -e "govet checking failed:\n${vetRes}"
+	exit 255
+fi
+
+echo "Success"