Merge branch 'master' into build-go-verbose

.travis.yml

@@ -1,12 +1,13 @@
 language: go
 
 go:
+  - tip
   - 1.3
   - 1.2
 
 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
@@ -15,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"

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

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
+

hack/test-go.sh

@@ -44,6 +44,11 @@ find_test_pkgs() {
   find_test_dirs | xargs -n1 printf "${KUBE_GO_PACKAGE}/%s\n"
 }
 
+# there is currently a race in the coverage code in tip.  Remove this when it is fixed
+# see https://code.google.com/p/go/issues/detail?id=8630 for details.
+if [[ "${TRAVIS_GO_VERSION}" -eq "tip" ]]; then
+  KUBE_COVER=""
+fi
 # -covermode=atomic becomes default with -race in Go >=1.3
 KUBE_COVER=${KUBE_COVER:--cover -covermode=atomic}
 KUBE_TIMEOUT=${KUBE_TIMEOUT:--timeout 30s}