github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

pull/6/head
Jeff Grafton 2015-10-08 15:50:47 -07:00
parent 6d7d7080df
commit 28314c79ce
4 changed files with 5 additions and 5 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

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

@ -18,7 +18,7 @@ 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.0}

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