github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-15 14:53:44 +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
commit 8a5f748846
7 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -8,7 +8,7 @@ matrix:
install: install:
- go get github.com/tools/godep - go get github.com/tools/godep
- ./hack/travis/install-etcd.sh - ./hack/install-etcd.sh
- ./hack/build-go.sh - ./hack/build-go.sh
- export PATH=$GOPATH/bin:./third_party/etcd:$PATH - export PATH=$GOPATH/bin:./third_party/etcd:$PATH

7
build/build-image/Dockerfile
View File

@ -35,11 +35,12 @@ RUN rm -rf /var/lib/apt/lists/
RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -y rsync RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -y rsync
# Download and symlink etcd. We need this for our integration tests. # Download and symlink etcd. We need this for our integration tests.
ENV ETCD_VERSION v2.0.12
RUN mkdir -p /usr/local/src/etcd &&\ RUN mkdir -p /usr/local/src/etcd &&\
cd /usr/local/src/etcd &&\ cd /usr/local/src/etcd &&\
curl -L -O -s https://github.com/coreos/etcd/releases/download/v2.0.0/etcd-v2.0.0-linux-amd64.tar.gz &&\ curl -fsSLO https://github.com/coreos/etcd/releases/download/$ETCD_VERSION/etcd-$ETCD_VERSION-linux-amd64.tar.gz &&\
tar xzf etcd-v2.0.0-linux-amd64.tar.gz &&\ tar xzf etcd-$ETCD_VERSION-linux-amd64.tar.gz &&\
ln -s ../src/etcd/etcd-v2.0.0-linux-amd64/etcd /usr/local/bin/ ln -s ../src/etcd/etcd-$ETCD_VERSION-linux-amd64/etcd /usr/local/bin/
# Mark this as a kube-build container # Mark this as a kube-build container
RUN touch /kube-build-image RUN touch /kube-build-image

2
cluster/mesos/docker/test/bin/install-etcd.sh
View File

@ -20,7 +20,7 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
ETCD_VERSION=${ETCD_VERSION:-v2.0.11} ETCD_VERSION=${ETCD_VERSION:-v2.0.12}
full_name=etcd-${ETCD_VERSION}-linux-amd64 full_name=etcd-${ETCD_VERSION}-linux-amd64
archive_url=https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/${full_name}.tar.gz archive_url=https://github.com/coreos/etcd/releases/download/${ETCD_VERSION}/${full_name}.tar.gz

4
docs/devel/development.md
View File

@ -264,7 +264,9 @@ Coverage results for the project can also be viewed on [Coveralls](https://cover
## Integration tests ## Integration tests
You need an [etcd](https://github.com/coreos/etcd/releases/tag/v2.0.0) in your path, please make sure it is installed and in your ``$PATH``. You need an [etcd](https://github.com/coreos/etcd/releases) in your path. To download a copy of the latest version used by Kubernetes, either
* run `hack/install-etcd.sh`, which will download etcd to `third_party/etcd`, and then set your `PATH` to include `third_party/etcd`.
* inspect `cluster/saltbase/salt/etcd/etcd.manifest` for the correct version, and then manually download and install it to some place in your `PATH`.
```sh ```sh
cd kubernetes cd kubernetes

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

@ -18,11 +18,11 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail 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" 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 - | 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. # Install a few things needed by unit and /integration tests.
go get -u github.com/jstemmer/go-junit-report go get -u github.com/jstemmer/go-junit-report
./hack/travis/install-etcd.sh ./hack/install-etcd.sh
# Enable the Go race detector. # Enable the Go race detector.
export KUBE_RACE=-race export KUBE_RACE=-race

4
shippable.yml
View File

@ -32,7 +32,7 @@ before_install:
- if [[ $SHIPPABLE_GO_VERSION == "tip" ]]; then gvm install tip; gvm use tip; fi - 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 == *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 - 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 - 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 - 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 - export PATH=$GOPATH/bin:./third_party/etcd:$PATH
@ -44,7 +44,7 @@ install:
- go get github.com/jstemmer/go-junit-report - go get github.com/jstemmer/go-junit-report
- ./hack/build-go.sh - ./hack/build-go.sh
- godep go install ./... - godep go install ./...
- ./hack/travis/install-etcd.sh - ./hack/install-etcd.sh
- ./hack/verify-gofmt.sh - ./hack/verify-gofmt.sh
- ./hack/verify-boilerplate.sh - ./hack/verify-boilerplate.sh
- ./hack/verify-description.sh - ./hack/verify-description.sh