kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Explicitly use localkube bootstrapper and binary 

Use the localkube binary built from CI in the integration tests.
pull/2101/head
Matt Rickard 2017-10-20 17:28:43 -04:00
parent bb9b7b1385
commit a2a4780186
9 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -149,7 +149,7 @@ test-pkg/%:
go test -v -test.timeout=30m $(REPOPATH)/$* --tags="$(MINIKUBE_BUILD_TAGS)"
.PHONY: all
all: cross drivers e2e-cross images
all: cross drivers e2e-cross images out/localkube
.PHONY: drivers
drivers: out/docker-machine-driver-hyperkit out/docker-machine-driver-kvm2
@ -189,7 +189,7 @@ $(GOPATH)/bin/go-bindata:
GOBIN=$(GOPATH)/bin go get github.com/jteeuwen/go-bindata/...
.PHONY: cross
cross: out/localkube out/minikube-linux-amd64 out/minikube-darwin-amd64 out/minikube-windows-amd64.exe
cross: out/minikube-linux-amd64 out/minikube-darwin-amd64 out/minikube-windows-amd64.exe
.PHONY: e2e-cross
e2e-cross: e2e-linux-amd64 e2e-darwin-amd64 e2e-windows-amd64.exe

3
hack/jenkins/linux_integration_tests_kvm.sh
View File

@ -28,7 +28,8 @@ set -e
OS_ARCH="linux-amd64"
VM_DRIVER="kvm"
JOB_NAME="Linux-KVM"
EXTRA_ARGS="--bootstrapper=localkube"
EXTRA_START_ARGS="--kubernetes-version=file://$PWD/out/localkube"
# Download files and set permissions
source common.sh

4
hack/jenkins/linux_integration_tests_none.sh
View File

@ -29,7 +29,9 @@ set -e
OS_ARCH="linux-amd64"
VM_DRIVER="none"
JOB_NAME="Linux-None"
EXTRA_BUILD_ARGS="$EXTRA_BUILD_ARGS --use-vendored-driver"
EXTRA_ARGS="--bootstrapper=localkube"
EXTRA_START_ARGS="--kubernetes-version=file://$PWD/out/localkube"
SUDO_PREFIX="sudo -E "
export KUBECONFIG="/root/.kube/config"

2
hack/jenkins/linux_integration_tests_virtualbox.sh
View File

@ -28,6 +28,8 @@ set -e
OS_ARCH="linux-amd64"
VM_DRIVER="virtualbox"
JOB_NAME="Linux-VirtualBox"
EXTRA_ARGS="--bootstrapper=localkube"
EXTRA_START_ARGS="--kubernetes-version=file://$PWD/out/localkube"
# Download files and set permissions
source common.sh

2
hack/jenkins/osx_integration_tests_hyperkit.sh
View File

@ -29,6 +29,8 @@ set -e
OS_ARCH="darwin-amd64"
VM_DRIVER="hyperkit"
JOB_NAME="OSX-Hyperkit"
EXTRA_ARGS="--bootstrapper=localkube"
EXTRA_START_ARGS="--kubernetes-version=file://$PWD/out/localkube"
# Download files and set permissions

2
hack/jenkins/osx_integration_tests_virtualbox.sh
View File

@ -28,6 +28,8 @@ set -e
OS_ARCH="darwin-amd64"
VM_DRIVER="virtualbox"
JOB_NAME="OSX-Virtualbox"
EXTRA_ARGS="--bootstrapper=localkube"
EXTRA_START_ARGS="--kubernetes-version=file://$PWD/out/localkube"
# Download files and set permissions
source common.sh

3
hack/jenkins/osx_integration_tests_virtualbox_kubeadm.sh
View File

@ -28,7 +28,8 @@ set -e
OS_ARCH="darwin-amd64"
VM_DRIVER="virtualbox"
JOB_NAME="OSX-Virtualbox-Kubeadm"
EXTRA_ARGS="--bootstrapper=kubeadm"
EXTRA_ARGS="--bootstrapper=localkube"
EXTRA_START_ARGS="--kubernetes-version=file://$PWD/out/localkube"
# Download files and set permissions
source common.sh

2
hack/jenkins/osx_integration_tests_xhyve.sh
View File

@ -29,6 +29,8 @@ set -e
OS_ARCH="darwin-amd64"
VM_DRIVER="xhyve"
JOB_NAME="OSX-Xhyve"
EXTRA_ARGS="--bootstrapper=localkube"
EXTRA_START_ARGS="--kubernetes-version=file://$PWD/out/localkube"
# Download files and set permissions

2
hack/jenkins/windows_integration_test_virtualbox.ps1
View File

@ -21,7 +21,7 @@ gsutil.cmd cp -r gs://minikube-builds/$env:MINIKUBE_LOCATION/testdata .
./out/minikube-windows-amd64.exe delete
Remove-Item -Recurse -Force C:\Users\jenkins\.minikube
out/e2e-windows-amd64.exe --% -minikube-start-args="--vm-driver=virtualbox" -minikube-args="--v=10 --logtostderr $env:EXTRA_BUILD_ARGS" -test.v -test.timeout=30m -binary=out/minikube-windows-amd64.exe
out/e2e-windows-amd64.exe --% -minikube-start-args="--vm-driver=virtualbox --kubernetes-version=file://./out/localkube " -minikube-args="--v=10 --logtostderr" -test.v -test.timeout=30m -binary=out/minikube-windows-amd64.exe
$env:result=$lastexitcode
# If the last exit code was 0->success, x>0->error