ci: use gotestsum for running unit tests

This allow us to output a junit test file which can be fed to Jenkins.

While building we build for all the architectures we are eventually going to
care about.

Lastly kill a tray trailing tab in the `Makefile` which `emacs` complains about.

Signed-off-by: Ian Campbell <ijc@docker.com>

Author: Ian Campbell

Dockerfile

@@ -21,6 +21,15 @@ ENV PATH=${PATH}:/go/src/github.com/docker/app/bin/
 ARG DEP_VERSION=v0.5.0
 RUN curl -o /usr/bin/dep -L https://github.com/golang/dep/releases/download/${DEP_VERSION}/dep-linux-amd64 && \
     chmod +x /usr/bin/dep
+ARG GOTESTSUM_VERSION=v0.3.4
+RUN mkdir $GOPATH/src/gotest.tools && \
+    git clone -q https://github.com/gotestyourself/gotestsum $GOPATH/src/gotest.tools/gotestsum && \
+    cd $GOPATH/src/gotest.tools/gotestsum && \
+    git -C $GOPATH/src/gotest.tools/gotestsum checkout -q $GOTESTSUM_VERSION && \
+    GO111MODULE=on GOOS=linux   go build -o /usr/local/bin/gotestsum-linux       gotest.tools/gotestsum && \
+    GO111MODULE=on GOOS=darwin  go build -o /usr/local/bin/gotestsum-darwin      gotest.tools/gotestsum && \
+    GO111MODULE=on GOOS=windows go build -o /usr/local/bin/gotestsum-windows.exe gotest.tools/gotestsum && \
+    ln -s gotestsum-linux /usr/local/bin/gotestsum
 RUN go get -d gopkg.in/mjibson/esc.v0 && \
     cd /go/src/github.com/mjibson/esc && \
     go build -v -o /usr/bin/esc . && \

Jenkinsfile

@@ -115,6 +115,8 @@ pipeline {
                     }
                     post {
                         always {
+                            archiveArtifacts 'src/github.com/docker/app/_build/test-results/*.xml'
+                            junit 'src/github.com/docker/app/_build/test-results/*.xml'
                             sh 'docker rmi docker/cnab-app-base:$BUILD_TAG-coverage'
                             deleteDir()
                         }

Jenkinsfile.baguette

@@ -101,6 +101,8 @@ pipeline {
                     }
                     post {
                         always {
+                            archiveArtifacts 'src/github.com/docker/app/_build/test-results/*.xml'
+                            junit 'src/github.com/docker/app/_build/test-results/*.xml'
                             sh 'docker rmi docker/cnab-app-base:$BUILD_TAG-coverage'
                             deleteDir()
                         }

Makefile

@@ -24,9 +24,11 @@ ifeq ($(OS),Windows_NT)
   EXEC_EXT := .exe
 endif
 
+TEST_RESULTS_DIR = _build/test-results
 STATIC_FLAGS= CGO_ENABLED=0
 GO_BUILD = $(STATIC_FLAGS) go build -tags=$(BUILDTAGS) -ldflags=$(LDFLAGS)
 GO_TEST = $(STATIC_FLAGS) go test -tags=$(BUILDTAGS) -ldflags=$(LDFLAGS)
+GO_TESTSUM = $(STATIC_FLAGS) gotestsum --junitfile $(TEST_RESULTS_DIR)/$(1) -- -tags=$(BUILDTAGS) -ldflags=$(LDFLAGS)
 
 all: bin/$(BIN_NAME) test
 
@@ -79,15 +81,17 @@ test-e2e: bin/$(BIN_NAME) ## run end-to-end tests
 
 test-unit: ## run unit tests
 	@echo "Running unit tests..."
-	$(GO_TEST) $(shell go list ./... | grep -vE '/e2e')
+	@$(call mkdir,$(TEST_RESULTS_DIR))
+	$(call GO_TESTSUM,unit.xml) $(shell go list ./... | grep -vE '/e2e')
 
 coverage-bin:
 	CGO_ENABLED=0 go test -tags="$(BUILDTAGS) testrunmain" -ldflags=$(LDFLAGS) -coverpkg="./..." -c -o _build/$(BIN_NAME).cov ./cmd/docker-app
 
 coverage-test-unit:
 	@echo "Running unit tests (coverage)..."
 	@$(call mkdir,_build/cov)
-	$(GO_TEST) -cover -test.coverprofile=_build/cov/unit.out $(shell go list ./... | grep -vE '/e2e')
+	@$(call mkdir,$(TEST_RESULTS_DIR))
+	$(call GO_TESTSUM,unit-coverage.xml) -cover -test.coverprofile=_build/cov/unit.out $(shell go list ./... | grep -vE '/e2e')
 
 coverage-test-e2e: coverage-bin
 	@echo "Running e2e tests (coverage)..."

docker.Makefile

@@ -87,7 +87,8 @@ tars:
 test: test-unit test-e2e ## run all tests
 
 test-unit: build_dev_image ## run unit tests
-	docker run --rm $(DEV_IMAGE_NAME) make EXPERIMENTAL=$(EXPERIMENTAL) test-unit
+	@$(call mkdir,_build/test-results)
+	docker run --rm -v $(CURDIR)/_build/test-results:/test-results $(DEV_IMAGE_NAME) make EXPERIMENTAL=$(EXPERIMENTAL) test-unit
 
 test-e2e: build_dev_image invocation-image ## run end-to-end tests
 	docker run -v /var/run:/var/run:ro --rm --network="host" $(DEV_IMAGE_NAME) make EXPERIMENTAL=$(EXPERIMENTAL) bin/$(BIN_NAME) test-e2e
@@ -97,6 +98,7 @@ coverage: build_dev_image ## run tests with coverage
 	@$(call mkdir,_build)
 	docker run -v /var/run:/var/run:ro --name $(COV_CTNR_NAME) --network="host" -t $(DEV_IMAGE_NAME) make COMMIT=${COMMIT} TAG=${TAG} EXPERIMENTAL=$(EXPERIMENTAL) coverage
 	docker cp $(COV_CTNR_NAME):$(PKG_PATH)/_build/cov/ ./_build/ci-cov
+	docker cp $(COV_CTNR_NAME):$(PKG_PATH)/_build/test-results/ ./_build/test-results
 	docker rm $(COV_CTNR_NAME)
 
 gradle-test:
@@ -124,7 +126,7 @@ vendor: build_dev_image
 clean-vendor-cache:
 	docker rm -f docker-app-vendoring || true
 	docker volume rm -f docker-app-vendor-cache
-	
+
 check-vendor: build_dev_image
 	$(info Check Vendoring...)
 	docker run --rm $(DEV_IMAGE_NAME) sh -c "make vendor && hack/check-git-diff vendor"