From 28314c79cefe23a372b1670e4b2f31b1d3f2ecb3 Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Thu, 8 Oct 2015 15:50:47 -0700
Subject: [PATCH] Move hack/travis/install-etcd.sh to hack/

---
 .travis.yml                       | 2 +-
 hack/{travis => }/install-etcd.sh | 2 +-
 hack/jenkins/gotest.sh            | 2 +-
 shippable.yml                     | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename hack/{travis => }/install-etcd.sh (95%)

diff --git a/.travis.yml b/.travis.yml
index cb4d178c98..cb902f565c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ matrix:
 
 install:
   - go get github.com/tools/godep
-  - ./hack/travis/install-etcd.sh
+  - ./hack/install-etcd.sh
   - ./hack/build-go.sh
   - export PATH=$GOPATH/bin:./third_party/etcd:$PATH
 
diff --git a/hack/travis/install-etcd.sh b/hack/install-etcd.sh
similarity index 95%
rename from hack/travis/install-etcd.sh
rename to hack/install-etcd.sh
index 93e50029bd..9db661d2e5 100755
--- a/hack/travis/install-etcd.sh
+++ b/hack/install-etcd.sh
@@ -18,7 +18,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
+KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
 
 ETCD_VERSION=${ETCD_VERSION:-v2.0.0}
 
diff --git a/hack/jenkins/gotest.sh b/hack/jenkins/gotest.sh
index da654a68f1..19b1d473e9 100755
--- a/hack/jenkins/gotest.sh
+++ b/hack/jenkins/gotest.sh
@@ -32,7 +32,7 @@ export PATH=${GOPATH}/bin:${HOME}/third_party/etcd:/usr/local/go/bin:$PATH
 
 # Install a few things needed by unit and /integration tests.
 go get -u github.com/jstemmer/go-junit-report
-./hack/travis/install-etcd.sh
+./hack/install-etcd.sh
 
 # Enable the Go race detector.
 export KUBE_RACE=-race
diff --git a/shippable.yml b/shippable.yml
index c96dfb5378..7a1158b9e4 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -32,7 +32,7 @@ before_install:
   - if [[ $SHIPPABLE_GO_VERSION == "tip" ]]; then gvm install tip; gvm use tip; fi
   - if [[ $SHIPPABLE_GO_VERSION == *release* ]]; then gvm install release; gvm use release; fi
   - if [[ $SHIPPABLE_GO_VERSION =~ [0-9].[0-9] ]]; then gvm install go$SHIPPABLE_GO_VERSION; gvm use go$SHIPPABLE_GO_VERSION; fi
-  - ./hack/travis/install-etcd.sh
+  - ./hack/install-etcd.sh
   - export GOPATH=$SHIPPABLE_GOPATH
   - mkdir -p /root/workspace/src/k8s.io; mv /root/workspace/src/github.com/kubernetes/kubernetes /root/workspace/src/k8s.io/kubernetes
   - export PATH=$GOPATH/bin:./third_party/etcd:$PATH
@@ -44,7 +44,7 @@ install:
   - go get github.com/jstemmer/go-junit-report
   - ./hack/build-go.sh
   - godep go install ./...
-  - ./hack/travis/install-etcd.sh
+  - ./hack/install-etcd.sh
   - ./hack/verify-gofmt.sh
   - ./hack/verify-boilerplate.sh
   - ./hack/verify-description.sh