From 3864cf453a94e35e8459f9a4a9644537712681c4 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Thu, 4 Sep 2014 10:30:31 -0700 Subject: [PATCH] Fix travis and cluster installs. --- .travis.yml | 4 ++-- cluster/saltbase/salt/etcd/init.sls | 1 + hack/install-etcd.sh | 21 +++++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100755 hack/install-etcd.sh diff --git a/.travis.yml b/.travis.yml index b34148365f3..73f17bf8db8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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" diff --git a/cluster/saltbase/salt/etcd/init.sls b/cluster/saltbase/salt/etcd/init.sls index 4e8f33e79df..783a88ecda2 100644 --- a/cluster/saltbase/salt/etcd/init.sls +++ b/cluster/saltbase/salt/etcd/init.sls @@ -5,6 +5,7 @@ etcd-install: cmd.wait: - cwd: /var/src/etcd - names: + - git checkout ab4bcc18694644d12f0c038339d8d039072502b1 - ./build - env: - PATH: {{ grains['path'] }}:/usr/local/bin diff --git a/hack/install-etcd.sh b/hack/install-etcd.sh new file mode 100755 index 00000000000..b9017c24190 --- /dev/null +++ b/hack/install-etcd.sh @@ -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 +