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

Download localkube in e2e test

pull/2101/head
Matt Rickard 2017-10-24 10:23:05 -07:00
parent c20ebde431
commit 3fceab3b51
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/jenkins/common.sh
View File

@ -27,6 +27,7 @@
# Copy only the files we need to this workspace
mkdir -p out/ testdata/
gsutil cp gs://minikube-builds/${MINIKUBE_LOCATION}/minikube-${OS_ARCH} out/
gsutil cp gs://minikube-builds/${MINIKUBE_LOCATION}/localkube out/
gsutil cp gs://minikube-builds/${MINIKUBE_LOCATION}/docker-machine-driver-* out/
gsutil cp gs://minikube-builds/${MINIKUBE_LOCATION}/e2e-${OS_ARCH} out/
gsutil cp gs://minikube-builds/${MINIKUBE_LOCATION}/testdata/busybox.yaml testdata/

5
hack/jenkins/windows_integration_test_virtualbox.ps1
View File

@ -14,15 +14,14 @@
mkdir -p out
gsutil.cmd cp gs://minikube-builds/$env:MINIKUBE_LOCATION/minikube-windows-amd64.exe out/
gsutil.cmd cp gs://minikube-builds/$env:MINIKUBE_LOCATION/localkube out/
gsutil.cmd cp gs://minikube-builds/$env:MINIKUBE_LOCATION/e2e-windows-amd64.exe out/
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 --kubernetes-version=file://./out/localkube " -minikube-args="--v=10 --logtostderr" -test.v -test.timeout=30m -binary=out/minikube-windows-amd64.exe
out/e2e-windows-amd64.exe -minikube-start-args="--vm-driver=virtualbox --kubernetes-version=https://storage.googleapis.com/minikube-builds/$env:MINIKUBE_LOCATION/localkube" -minikube-args="--v=10 --logtostderr" -binary=out/minikube-windows-amd64.exe -test.v -test.timeout=30m
$env:result=$lastexitcode
# If the last exit code was 0->success, x>0->error
If($env:result -eq 0){$env:status="success"}

2
pkg/minikube/kubernetes_versions/kubernetes_versions.go
View File

@ -81,7 +81,7 @@ func GetK8sVersionsFromURL(url string) (K8sReleases, error) {
}
func IsValidLocalkubeVersion(v string, url string) (bool, error) {
if strings.HasPrefix(v, "file://") {
if strings.HasPrefix(v, "file://") || strings.HasPrefix(v, "http") {
return true, nil
}
k8sReleases, err := GetK8sVersionsFromURL(url)