Merge pull request #3171 from tstromberg/master

make integration fixes: Install gsutil, improve GOPATH warning, fix path/exec issues.

Makefile

@@ -101,7 +101,15 @@ ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y)
 	$(call DOCKER,$(BUILD_IMAGE),/usr/bin/make $@)
 else
 ifneq ($(GOPATH)/src/$(REPOPATH),$(PWD))
-	$(warning Warning: Building minikube outside the GOPATH, should be $(GOPATH)/src/$(REPOPATH) but is $(PWD))
+	$(warning ******************************************************************************)
+	$(warning WARNING: You are building minikube outside the expected GOPATH:)
+	$(warning )
+	$(warning expected: $(GOPATH)/src/$(REPOPATH) )
+	$(warning   got:      $(PWD) )
+	$(warning )
+	$(warning You will likely encounter unusual build failures. For proper setup, read: )
+	$(warning https://github.com/kubernetes/minikube/blob/master/docs/contributors/build_guide.md)
+	$(warning ******************************************************************************)
 endif
 	GOOS=$* GOARCH=$(GOARCH) go build -tags "$(MINIKUBE_BUILD_TAGS)" -ldflags="$(MINIKUBE_LDFLAGS)" -a -o $@ k8s.io/minikube/cmd/minikube
 endif

hack/jenkins/common.sh

@@ -23,9 +23,19 @@
 # EXTRA_BUILD_ARGS: additional flags to pass into minikube start
 # JOB_NAME: the name of the logfile and check name to update on github
 
-
-# Copy only the files we need to this workspace
 mkdir -p out/ testdata/
+
+# Install gsutil if necessary.
+if ! type -P gsutil; then
+  if [[ ! -x "out/gsutil/gsutil" ]]; then
+    echo "Installing gsutil to $(pwd)/out ..."
+    curl -s https://storage.googleapis.com/pub/gsutil.tar.gz | tar -C out/ -zxf -
+  fi
+  export PATH="$(pwd)/out/gsutil:$PATH"
+fi
+
+# Add the out/ directory to the PATH, for using new drivers.
+export PATH="$(pwd)/out/":$PATH
 gsutil cp gs://minikube-builds/${MINIKUBE_LOCATION}/minikube-${OS_ARCH} out/
 gsutil cp gs://minikube-builds/${MINIKUBE_LOCATION}/docker-machine-driver-* out/
 gsutil cp gs://minikube-builds/${MINIKUBE_LOCATION}/e2e-${OS_ARCH} out/
@@ -48,8 +58,6 @@ export MINIKUBE_WANTREPORTERRORPROMPT=False
 sudo ./out/minikube-${OS_ARCH} delete || true
 ./out/minikube-${OS_ARCH} delete || true
 
-# Add the out/ directory to the PATH, for using new drivers.
-export PATH="$(pwd)/out/":$PATH
 
 # Linux cleanup
 virsh -c qemu:///system list --all \
@@ -90,7 +98,10 @@ find ~/.minikube || true
 
 # Allow this to fail, we'll switch on the return code below.
 set +e
-${SUDO_PREFIX}out/e2e-${OS_ARCH} -minikube-start-args="--vm-driver=${VM_DRIVER} ${EXTRA_START_ARGS}" -minikube-args="--v=10 --logtostderr ${EXTRA_ARGS}" -test.v -test.timeout=30m -binary=out/minikube-${OS_ARCH}
+${SUDO_PREFIX}out/e2e-${OS_ARCH} \
+  -minikube-start-args="--vm-driver=${VM_DRIVER} ${EXTRA_START_ARGS}" \
+  -minikube-args="--v=10 --logtostderr ${EXTRA_ARGS}" \
+  -test.v -test.timeout=30m -binary=out/minikube-${OS_ARCH}
 result=$?
 set -e
 

hack/jenkins/linux_integration_tests_kvm.sh

@@ -30,4 +30,4 @@ VM_DRIVER="kvm2"
 JOB_NAME="Linux-KVM"
 
 # Download files and set permissions
-source common.sh
+source ./common.sh

hack/jenkins/linux_integration_tests_none.sh

@@ -41,4 +41,4 @@ sudo kubeadm reset || true
 sudo rm -rf /data/*
 
 # Download files and set permissions
-source common.sh
+source ./common.sh

hack/jenkins/linux_integration_tests_virtualbox.sh

@@ -30,4 +30,4 @@ VM_DRIVER="virtualbox"
 JOB_NAME="Linux-VirtualBox"
 
 # Download files and set permissions
-source common.sh
+source ./common.sh

test/integration/cluster_status_test.go

@@ -47,7 +47,7 @@ func testClusterStatus(t *testing.T) {
 			}
 			if status != api.ConditionTrue {
 				err := fmt.Errorf("Component %s is not Healthy! Status: %s", i.GetName(), status)
-				t.Log("Retrying, %s", err)
+				t.Logf("Retrying, %s", err)
 				return err
 			}
 		}