Merge pull request #1179 from brendandburns/fix

Fix travis and cluster installs.
This commit is contained in:
Dawn Chen 2014-09-04 10:32:45 -07:00
commit 87278a6f56
3 changed files with 24 additions and 2 deletions

View File

@ -7,7 +7,7 @@ go:
install:
- go get code.google.com/p/go.tools/cmd/cover
- go get github.com/coreos/etcd
- ./hack/install-etcd.sh
- ./hack/verify-gofmt.sh
- ./hack/verify-boilerplate.sh
- ./hack/install-std-race.sh
@ -16,7 +16,7 @@ install:
script:
- ./hack/test-go.sh
- PATH=$HOME/gopath/bin:$PATH ./hack/test-cmd.sh
- PATH=$HOME/gopath/bin:$PATH ./hack/test-integration.sh
- PATH=$HOME/gopath/bin:$HOME/etcd/bin:$PATH ./hack/test-integration.sh
notifications:
irc: "chat.freenode.net#google-containers"

View File

@ -5,6 +5,7 @@ etcd-install:
cmd.wait:
- cwd: /var/src/etcd
- names:
- git checkout ab4bcc18694644d12f0c038339d8d039072502b1
- ./build
- env:
- PATH: {{ grains['path'] }}:/usr/local/bin

21
hack/install-etcd.sh Executable file
View File

@ -0,0 +1,21 @@
#!/bin/bash
# Copyright 2014 Google Inc. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
git clone https://github.com/coreos/etcd.git
cd etcd
git checkout ab4bcc18694644d12f0c038339d8d039072502b1
./build