diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index d5b152f0f6a6..548bf01b8809 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -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/ diff --git a/hack/jenkins/windows_integration_test_virtualbox.ps1 b/hack/jenkins/windows_integration_test_virtualbox.ps1 index 5479e03a5d41..6db7ce01e40a 100644 --- a/hack/jenkins/windows_integration_test_virtualbox.ps1 +++ b/hack/jenkins/windows_integration_test_virtualbox.ps1 @@ -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-largs="--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"} diff --git a/hack/jenkins/windows_integration_test_virtualbox_kubeadm_crio.ps1 b/hack/jenkins/windows_integration_test_virtualbox_kubeadm_crio.ps1 index 8d1077d3200b..07ff23020b72 100644 --- a/hack/jenkins/windows_integration_test_virtualbox_kubeadm_crio.ps1 +++ b/hack/jenkins/windows_integration_test_virtualbox_kubeadm_crio.ps1 @@ -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 --container-runtime=cri-o" -minikube-args="--v=10 --logtostderr --bootstrapper=kubeadm" -test.v -test.timeout=30m -binary=out/minikube-windows-amd64.exe +out/e2e-windows-amd64.exe --% -minikube-start-args="--vm-driver=virtualbox --container-runtime=cri-o" -minikube-args="--v=10 --logtostderr --bootstrapper=kubeadm" --% -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 diff --git a/pkg/minikube/kubernetes_versions/kubernetes_versions.go b/pkg/minikube/kubernetes_versions/kubernetes_versions.go index 0c354de02e9c..cffaecc30ec0 100644 --- a/pkg/minikube/kubernetes_versions/kubernetes_versions.go +++ b/pkg/minikube/kubernetes_versions/kubernetes_versions.go @@ -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)