Have CI build and run the e2e tests on each platform

Signed-off-by: Mathieu Champlon <[email protected]>

Author: mat007

Dockerfile

@@ -13,9 +13,9 @@ COPY . .
 FROM build AS bin-build
 ARG COMMIT
 ARG TAG
-RUN make COMMIT=${COMMIT} TAG=${TAG} bin-all
+RUN make COMMIT=${COMMIT} TAG=${TAG} bin-all e2e-all
 
 FROM build AS test
 ARG COMMIT
 ARG TAG
-RUN make COMMIT=${COMMIT} TAG=${TAG} unit-test e2e-test
+RUN make COMMIT=${COMMIT} TAG=${TAG} unit-test

Jenkinsfile

@@ -19,13 +19,16 @@ pipeline {
                     script {
                         try {
                             checkout scm
-                            sh 'rm -f *.tar.gz'
+                            sh 'rm -rf *.tar.gz stash'
                             sh 'docker image prune -f'
                             sh 'make ci-lint'
                             sh 'make ci-test'
                             sh 'make ci-bin-all'
-                            sh 'ls *.tar.gz | xargs -i tar xf {}'
-                            stash name: "binaries", includes: "docker-app-*", excludes: "*.tar.gz"
+                            sh 'mkdir stash'
+                            sh 'ls *.tar.gz | xargs -i tar -xf {} -C stash'
+                            dir('stash') {
+                                stash name: 'e2e'
+                            }
                             archiveArtifacts '*.tar.gz'
                         } finally {
                             def clean_images = /docker image ls --format "{{.ID}}\t{{.Tag}}" | grep $(git describe --always --dirty) | awk '{print $1}' | xargs docker image rm/
@@ -43,8 +46,10 @@ pipeline {
                     }
                     steps  {
                         dir('src/github.com/docker/lunchbox') {
-                            unstash "binaries"
-                            sh './docker-app-linux version'
+                            deleteDir()
+                            unstash 'e2e'
+                            sh 'ls -la'
+                            sh './docker-app-e2e-linux'
                         }
                     }
                 }
@@ -54,8 +59,10 @@ pipeline {
                     }
                     steps {
                         dir('src/github.com/docker/lunchbox') {
-                            unstash "binaries"
-                            sh './docker-app-darwin version'
+                            deleteDir()
+                            unstash 'e2e'
+                            sh 'ls -la'
+                            sh './docker-app-e2e-darwin'
                         }
                     }
                 }
@@ -65,8 +72,10 @@ pipeline {
                     }
                     steps {
                         dir('src/github.com/docker/lunchbox') {
-                            unstash "binaries"
-                            bat 'docker-app-windows.exe version'
+                            deleteDir()
+                            unstash "e2e"
+                            bat 'dir'
+                            bat 'docker-app-e2e-windows.exe'
                         }
                     }
                 }

Makefile

@@ -1,5 +1,6 @@
 PKG_NAME := github.com/docker/lunchbox
 BIN_NAME := docker-app
+E2E_NAME := $(BIN_NAME)-e2e
 
 # Enable experimental features. "on" or "off"
 EXPERIMENTAL := off
@@ -15,7 +16,6 @@ GO_VERSION := 1.10.1
 IMAGE_BUILD_ARGS := \
     --build-arg ALPINE_VERSION=$(ALPINE_VERSION) \
     --build-arg GO_VERSION=$(GO_VERSION) \
-    --build-arg BIN_NAME=$(BIN_NAME) \
     --build-arg COMMIT=$(COMMIT) \
     --build-arg TAG=$(TAG)
 
@@ -25,17 +25,21 @@ LDFLAGS := "-s -w \
 	-X $(PKG_NAME)/internal.Experimental=$(EXPERIMENTAL)"
 
 GO_BUILD := CGO_ENABLED=0 go build
-GO_TEST := go test
+GO_TEST := CGO_ENABLED=0 go test
 
 #####################
 # Local Development #
 #####################
 
+OS_LIST ?= darwin linux windows
+
 EXEC_EXT :=
 ifeq ($(OS),Windows_NT)
     EXEC_EXT := .exe
 endif
 
+PKG_PATH := /go/src/$(PKG_NAME)
+
 all: bin test
 
 check_go_env:
@@ -46,20 +50,23 @@ bin: check_go_env
 	@echo "Building _build/$(BIN_NAME)$(EXEC_EXT)..."
 	$(GO_BUILD) -ldflags=$(LDFLAGS) -i -o _build/$(BIN_NAME)$(EXEC_EXT)
 
-OS_LIST ?= darwin linux windows
 bin-all: check_go_env
 	@echo "Building for all platforms..."
-	$(foreach OS, $(OS_LIST), GOOS=$(OS) $(GO_BUILD) -ldflags=$(LDFLAGS) -i -o _build/$(TAG)/$(BIN_NAME)-$(OS)$(if $(filter windows, $(OS)),.exe,) || exit 1;)
+	$(foreach OS, $(OS_LIST), GOOS=$(OS) $(GO_BUILD) -ldflags=$(LDFLAGS) -i -o _build/$(BIN_NAME)-$(OS)$(if $(filter windows, $(OS)),.exe,) || exit 1;)
+
+e2e-all: check_go_env
+	@echo "Building for all platforms..."
+	$(foreach OS, $(OS_LIST), GOOS=$(OS) $(GO_TEST) -c -i -o _build/$(E2E_NAME)-$(OS)$(if $(filter windows, $(OS)),.exe,) ./e2e || exit 1;)
 
 release:
-	gsutil cp -r _build/$(TAG) gs://docker_app
+	gsutil cp -r _build gs://docker_app
 
 test check: lint unit-test e2e-test
 
 lint:
 	@echo "Linting..."
 	@tar -c Dockerfile.lint gometalinter.json | docker build -t $(IMAGE_NAME)-lint $(IMAGE_BUILD_ARGS) -f Dockerfile.lint - --target=lint-volume > /dev/null
-	@docker run --rm -v $(dir $(realpath $(lastword $(MAKEFILE_LIST)))):/go/src/$(PKG_NAME):ro,cached $(IMAGE_NAME)-lint
+	@docker run --rm -v $(dir $(realpath $(lastword $(MAKEFILE_LIST)))):$(PKG_PATH):ro,cached $(IMAGE_NAME)-lint
 
 e2e-test: bin
 	@echo "Running e2e tests..."
@@ -72,9 +79,9 @@ unit-test:
 clean:
 	rm -Rf ./_build docker-app-*.tar.gz
 
-######
-# CI #
-######
+##########################
+# Continuous Integration #
+##########################
 
 ci-lint:
 	@echo "Linting..."
@@ -87,7 +94,8 @@ ci-test:
 
 ci-bin-all:
 	docker build -t $(IMAGE_NAME)-bin-all:$(TAG) $(IMAGE_BUILD_ARGS) . --target=bin-build
-	$(foreach OS, $(OS_LIST), docker run --rm $(IMAGE_NAME)-bin-all:$(TAG) tar -cz $(BIN_NAME)-$(OS)$(if $(filter windows, $(OS)),.exe,) -C /go/src/$(PKG_NAME)/_build/$(TAG)/ > $(BIN_NAME)-$(OS)-$(TAG).tar.gz || exit 1;)
+	$(foreach OS, $(OS_LIST), docker run --rm $(IMAGE_NAME)-bin-all:$(TAG) tar -cz -C $(PKG_PATH)/_build $(BIN_NAME)-$(OS)$(if $(filter windows, $(OS)),.exe,) > $(BIN_NAME)-$(OS)-$(TAG).tar.gz || exit 1;)
+	$(foreach OS, $(OS_LIST), docker run --rm $(IMAGE_NAME)-bin-all:$(TAG) /bin/sh -c "cp $(PKG_PATH)/_build/*-$(OS)* $(PKG_PATH)/e2e && cd $(PKG_PATH)/e2e && tar -cz * --exclude=*.go" > $(E2E_NAME)-$(OS)-$(TAG).tar.gz || exit 1;)
 
-.PHONY: bin bin-all release test check lint e2e-test unit-test clean ci-lint ci-test ci-bin-all
+.PHONY: bin bin-all release test check lint e2e-test e2e-all unit-test clean ci-lint ci-test ci-bin-all ci-e2e-all
 .DEFAULT: all