Merge pull request #1786 from r2d4/e2e

Move e2e binary compilation to makefile

Makefile

@@ -108,6 +108,9 @@ else
 	$(call MINIKUBE_GO_BUILD_CMD,$@,$*)
 endif
 
+out/e2e-%-amd64:
+	GOOS=$* GOARCH=amd64 go test -c k8s.io/minikube/test/integration --tags=integration -o $@
+
 minikube_iso: # old target kept for making tests happy
 	echo $(ISO_VERSION) > deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/VERSION
 	if [ ! -d $(BUILD_DIR)/buildroot ]; then \
@@ -157,6 +160,9 @@ $(GOPATH)/bin/go-bindata:
 .PHONY: cross
 cross: out/localkube out/minikube-linux-amd64 out/minikube-darwin-amd64 out/minikube-windows-amd64.exe
 
+.PHONY: cross-e2e
+e2e-cross: out/e2e-linux-amd64 out/e2e-darwin-amd64 out/e2e-windows-amd64
+
 .PHONY: checksum
 checksum:
 	for f in out/localkube out/minikube-linux-amd64 out/minikube-darwin-amd64 out/minikube-windows-amd64.exe out/minikube.iso; do \

hack/jenkins/minikube_cross_build_and_upload.sh

@@ -40,15 +40,10 @@ fi
 
 export GOPATH=~/go
 
-# Build all platforms (Windows, Linux, OSX)
-BUILD_IN_DOCKER=y make cross
-
-# Build the e2e test target for Darwin and Linux. We don't run tests on Windows yet.
+# Cross build the binary and test binary for all platforms (Windows, Linux, OSX).
 # We build these on Linux, but run the tests on different platforms.
 # This makes it easier to provision slaves, since they don't need to have a go toolchain.'
-GOOS=darwin GOARCH=amd64 go test -c k8s.io/minikube/test/integration --tags=integration -o out/e2e-darwin-amd64
-GOOS=linux GOARCH=amd64 go test -c k8s.io/minikube/test/integration --tags=integration -o out/e2e-linux-amd64
-GOOS=windows GOARCH=amd64 go test -c k8s.io/minikube/test/integration --tags=integration -o out/e2e-windows-amd64.exe
+BUILD_IN_DOCKER=y make cross e2e-cross
 cp -r test/integration/testdata out/
 
 # Don't upload the buildroot artifacts if they exist