From 65e10cf50ca13b5c78ec76111dfae0b487fc7cea Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Thu, 26 May 2016 21:08:01 -0700 Subject: [PATCH] Avoid duplicate building in Jenkins unit/integration job --- hack/jenkins/test-dockerized.sh | 1 - hack/test-cmd.sh | 10 +++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/hack/jenkins/test-dockerized.sh b/hack/jenkins/test-dockerized.sh index 7f478f8248..752f76e52c 100755 --- a/hack/jenkins/test-dockerized.sh +++ b/hack/jenkins/test-dockerized.sh @@ -52,7 +52,6 @@ export LOG_LEVEL=4 cd /go/src/k8s.io/kubernetes rm -rf Godeps/_workspace # Temporary until _workspace is fully obliterated -./hack/build-go.sh go install ./cmd/... ./hack/install-etcd.sh diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh index 2221df6892..c992e54864 100755 --- a/hack/test-cmd.sh +++ b/hack/test-cmd.sh @@ -126,8 +126,13 @@ function kubectl-with-retry() } kube::util::trap_add cleanup EXIT SIGINT - kube::util::ensure-temp-dir + +"${KUBE_ROOT}/hack/build-go.sh" \ + cmd/kubectl \ + cmd/kube-apiserver \ + cmd/kube-controller-manager + kube::etcd::start ETCD_HOST=${ETCD_HOST:-127.0.0.1} @@ -164,6 +169,9 @@ kube::log::status "Running kubectl with no options" # Only run kubelet on platforms it supports if [[ "$(go env GOHOSTOS)" == "linux" ]]; then +"${KUBE_ROOT}/hack/build-go.sh" \ + cmd/kubelet + kube::log::status "Starting kubelet in masterless mode" "${KUBE_OUTPUT_HOSTBIN}/kubelet" \ --really-crash-for-testing=true \