Commit 28314c79 authored by Jeff Grafton's avatar Jeff Grafton

Move hack/travis/install-etcd.sh to hack/

parent 6d7d7080
......@@ -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
......
......@@ -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}
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment