github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 07:20:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into build-go-verbose

Browse Source
This commit is contained in:
Andriy Yurchuk 2014-09-04 21:27:15 +03:00
commit 24d0eb43ec
4 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -1,12 +1,13 @@
language: go language: go
go: go:
- tip
- 1.3 - 1.3
- 1.2 - 1.2
install: install:
- go get code.google.com/p/go.tools/cmd/cover - 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-gofmt.sh
- ./hack/verify-boilerplate.sh - ./hack/verify-boilerplate.sh
- ./hack/install-std-race.sh - ./hack/install-std-race.sh
@ -15,7 +16,7 @@ install:
script: script:
- ./hack/test-go.sh - ./hack/test-go.sh
- PATH=$HOME/gopath/bin:$PATH ./hack/test-cmd.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: notifications:
irc: "chat.freenode.net#google-containers" irc: "chat.freenode.net#google-containers"

1
cluster/saltbase/salt/etcd/init.sls
View File

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

5
hack/test-go.sh
View File

@ -44,6 +44,11 @@ find_test_pkgs() {
find_test_dirs | xargs -n1 printf "${KUBE_GO_PACKAGE}/%s\n" 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 # -covermode=atomic becomes default with -race in Go >=1.3
KUBE_COVER=${KUBE_COVER:--cover -covermode=atomic} KUBE_COVER=${KUBE_COVER:--cover -covermode=atomic}
KUBE_TIMEOUT=${KUBE_TIMEOUT:--timeout 30s} KUBE_TIMEOUT=${KUBE_TIMEOUT:--timeout 30s}