Merge pull request #58 from mat007/e2e-in-ci

chris-crone · web-flow · commit 626224950d05 · 2018-04-30T11:06:03.000+02:00
Have CI build and run the e2e tests on each platform
diff --git a/Dockerfile b/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
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -6,7 +6,7 @@ pipeline {
     }
 
     options {
-        checkoutToSubdirectory('src/github.com/docker/lunchbox')
+        skipDefaultCheckout(true)
     }
 
     stages {
@@ -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'
                         }
                     }
                 }
diff --git a/Makefile b/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
diff --git a/e2e/binary_test.go b/e2e/binary_test.go
@@ -25,30 +25,40 @@ func getBinary(t *testing.T) string {
 	if dockerApp != "" {
 		return dockerApp
 	}
-	dockerApp = os.Getenv("DOCKERAPP_BINARY")
-	if dockerApp == "" {
-		binName := "docker-app"
-		if runtime.GOOS == "windows" {
-			binName += ".exe"
-		}
-		locations := []string{".", "../_build"}
-		for _, l := range locations {
-			b := path.Join(l, binName)
-			if _, err := os.Stat(b); err == nil {
-				dockerApp = b
-				break
-			}
-		}
-	}
-	if dockerApp == "" {
+	binName := findBinary()
+	if binName == "" {
 		t.Error("cannot locate docker-app binary")
 	}
-	cmd := exec.Command(dockerApp, "version")
-	_, err := cmd.CombinedOutput()
-	assert.NilError(t, err, "failed to execute docker-app binary")
+	cmd := exec.Command(binName, "version")
+	err := cmd.Run()
+	assert.NilError(t, err, "failed to execute %s", binName)
+	dockerApp = binName
 	return dockerApp
 }
 
+func findBinary() string {
+	binNames := []string{
+		os.Getenv("DOCKERAPP_BINARY"),
+		"./docker-app-" + runtime.GOOS + binExt(),
+		"./docker-app" + binExt(),
+		"../_build/docker-app-" + runtime.GOOS + binExt(),
+		"../_build/docker_app" + binExt(),
+	}
+	for _, binName := range binNames {
+		if _, err := os.Stat(binName); err == nil {
+			return binName
+		}
+	}
+	return ""
+}
+
+func binExt() string {
+	if runtime.GOOS == "windows" {
+		return ".exe"
+	}
+	return ""
+}
+
 func TestRenderBinary(t *testing.T) {
 	getBinary(t)
 	apps, err := ioutil.ReadDir("render")

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ pipeline {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`options {`
`9`		`- checkoutToSubdirectory('src/github.com/docker/lunchbox')`
	`9`	`+ skipDefaultCheckout(true)`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`stages {`
`@@ -19,13 +19,16 @@ pipeline {`
`19`	`19`	`script {`
`20`	`20`	`try {`
`21`	`21`	`checkout scm`
`22`		`- sh 'rm -f *.tar.gz'`
	`22`	`+ sh 'rm -rf *.tar.gz stash'`
`23`	`23`	`sh 'docker image prune -f'`
`24`	`24`	`sh 'make ci-lint'`
`25`	`25`	`sh 'make ci-test'`
`26`	`26`	`sh 'make ci-bin-all'`
`27`		`- sh 'ls *.tar.gz \| xargs -i tar xf {}'`
`28`		`- stash name: "binaries", includes: "docker-app-", excludes: ".tar.gz"`
	`27`	`+ sh 'mkdir stash'`
	`28`	`+ sh 'ls *.tar.gz \| xargs -i tar -xf {} -C stash'`
	`29`	`+ dir('stash') {`
	`30`	`+ stash name: 'e2e'`
	`31`	`+ }`
`29`	`32`	`archiveArtifacts '*.tar.gz'`
`30`	`33`	`} finally {`
`31`	`34`	`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 {`
`43`	`46`	`}`
`44`	`47`	`steps {`
`45`	`48`	`dir('src/github.com/docker/lunchbox') {`
`46`		`- unstash "binaries"`
`47`		`- sh './docker-app-linux version'`
	`49`	`+ deleteDir()`
	`50`	`+ unstash 'e2e'`
	`51`	`+ sh 'ls -la'`
	`52`	`+ sh './docker-app-e2e-linux'`
`48`	`53`	`}`
`49`	`54`	`}`
`50`	`55`	`}`
`@@ -54,8 +59,10 @@ pipeline {`
`54`	`59`	`}`
`55`	`60`	`steps {`
`56`	`61`	`dir('src/github.com/docker/lunchbox') {`
`57`		`- unstash "binaries"`
`58`		`- sh './docker-app-darwin version'`
	`62`	`+ deleteDir()`
	`63`	`+ unstash 'e2e'`
	`64`	`+ sh 'ls -la'`
	`65`	`+ sh './docker-app-e2e-darwin'`
`59`	`66`	`}`
`60`	`67`	`}`
`61`	`68`	`}`
`@@ -65,8 +72,10 @@ pipeline {`
`65`	`72`	`}`
`66`	`73`	`steps {`
`67`	`74`	`dir('src/github.com/docker/lunchbox') {`
`68`		`- unstash "binaries"`
`69`		`- bat 'docker-app-windows.exe version'`
	`75`	`+ deleteDir()`
	`76`	`+ unstash "e2e"`
	`77`	`+ bat 'dir'`
	`78`	`+ bat 'docker-app-e2e-windows.exe'`
`70`	`79`	`}`
`71`	`80`	`}`
`72`	`81`	`}`