diff --git a/hack/jenkins/verify-dockerized.sh b/hack/jenkins/verify-dockerized.sh index c8d981bbec4..ba34d07df34 100755 --- a/hack/jenkins/verify-dockerized.sh +++ b/hack/jenkins/verify-dockerized.sh @@ -40,5 +40,4 @@ export LOG_LEVEL=4 cd /go/src/k8s.io/kubernetes -./hack/install-etcd.sh make verify diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh index e887426a083..9bb960cb448 100755 --- a/hack/lib/etcd.sh +++ b/hack/lib/etcd.sh @@ -103,6 +103,9 @@ kube::etcd::cleanup() { kube::etcd::install() { ( cd "${KUBE_ROOT}/third_party" + if [[ $(readlink etcd) == etcd-v${ETCD_VERSION}-* ]]; then + return # already installed + fi if [[ $(uname) == "Darwin" ]]; then download_file="etcd-v${ETCD_VERSION}-darwin-amd64.zip" url="https://github.com/coreos/etcd/releases/download/v${ETCD_VERSION}/${download_file}" diff --git a/hack/verify-openapi-spec.sh b/hack/verify-openapi-spec.sh index 159e73f853f..08b1edcbe3b 100755 --- a/hack/verify-openapi-spec.sh +++ b/hack/verify-openapi-spec.sh @@ -22,6 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" kube::golang::setup_env +kube::etcd::install make -C "${KUBE_ROOT}" WHAT=cmd/kube-apiserver diff --git a/hack/verify-swagger-spec.sh b/hack/verify-swagger-spec.sh index f3ca2217b49..92ee2bcb6b1 100755 --- a/hack/verify-swagger-spec.sh +++ b/hack/verify-swagger-spec.sh @@ -22,6 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. source "${KUBE_ROOT}/hack/lib/init.sh" kube::golang::setup_env +kube::etcd::install make -C "${KUBE_ROOT}" WHAT=cmd/kube-apiserver