github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-16 22:53:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #15336 from ixdy/install-etcd

Browse Source 
Move hack/travis/install-etcd.sh to hack/, and update etcd version to 2.0.12
This commit is contained in:
Marek Grabowski
2015-10-15 09:29:25 +02:00
parent e7ddb4f9a6 1c5f252653
commit 8a5f748846
7 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hack/travis/install-etcd.sh → hack/install-etcd.sh
View File

@@ -18,11 +18,11 @@ 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}
ETCD_VERSION=${ETCD_VERSION:-v2.0.12}
cd "${KUBE_ROOT}/third_party"
curl -sL https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz \
curl -fsSL https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz \
| tar xzf -
ln -sF etcd-${ETCD_VERSION}-linux-amd64 etcd
ln -fns etcd-${ETCD_VERSION}-linux-amd64 etcd

2
hack/jenkins/gotest.sh
View File

@@ -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