diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index 12fccf988b..d5b152f0f6 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -83,7 +83,7 @@ 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}" -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 diff --git a/hack/jenkins/linux_integration_tests_kvm_alt.sh b/hack/jenkins/linux_integration_tests_kvm_alt.sh index e150088603..f5de76da9a 100644 --- a/hack/jenkins/linux_integration_tests_kvm_alt.sh +++ b/hack/jenkins/linux_integration_tests_kvm_alt.sh @@ -28,6 +28,8 @@ set -e OS_ARCH="linux-amd64" VM_DRIVER="kvm2" JOB_NAME="Linux-KVM-Alt" +EXTRA_ARGS="--bootstrapper=localkube" +EXTRA_START_ARGS="--kubernetes-version=file://$PWD/out/localkube" # Download files and set permissions source common.sh diff --git a/pkg/minikube/kubernetes_versions/kubernetes_versions.go b/pkg/minikube/kubernetes_versions/kubernetes_versions.go index 79be539114..0c354de02e 100644 --- a/pkg/minikube/kubernetes_versions/kubernetes_versions.go +++ b/pkg/minikube/kubernetes_versions/kubernetes_versions.go @@ -21,6 +21,7 @@ import ( "fmt" "io" "net/http" + "strings" "k8s.io/minikube/pkg/minikube/constants" @@ -80,6 +81,9 @@ func GetK8sVersionsFromURL(url string) (K8sReleases, error) { } func IsValidLocalkubeVersion(v string, url string) (bool, error) { + if strings.HasPrefix(v, "file://") { + return true, nil + } k8sReleases, err := GetK8sVersionsFromURL(url) glog.Infoln(k8sReleases) if err != nil {