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

Exclude vendored etcd.

Browse Source
This commit is contained in:
Brendan Burns 2014-09-04 10:40:39 -07:00
parent 87278a6f56
commit 4a934427db
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -15,8 +15,8 @@ install:
script: script:
- ./hack/test-go.sh - ./hack/test-go.sh
- PATH=$HOME/gopath/bin:$PATH ./hack/test-cmd.sh - PATH=$HOME/gopath/bin:./third_party/etcd/bin:$PATH ./hack/test-cmd.sh
- PATH=$HOME/gopath/bin:$HOME/etcd/bin:$PATH ./hack/test-integration.sh - PATH=$HOME/gopath/bin:./third_party/etcd/bin:$PATH ./hack/test-integration.sh
notifications: notifications:
irc: "chat.freenode.net#google-containers" irc: "chat.freenode.net#google-containers"

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

@ -4,9 +4,9 @@ etcd-install:
- name: git://github.com/coreos/etcd - name: git://github.com/coreos/etcd
cmd.wait: cmd.wait:
- cwd: /var/src/etcd - cwd: /var/src/etcd
- names: - name: |
- git checkout ab4bcc18694644d12f0c038339d8d039072502b1 git checkout ab4bcc18694644d12f0c038339d8d039072502b1
- ./build ./build
- env: - env:
- PATH: {{ grains['path'] }}:/usr/local/bin - PATH: {{ grains['path'] }}:/usr/local/bin
- watch: - watch:

1
hack/install-etcd.sh
View File

@ -14,6 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
cd third_party
git clone https://github.com/coreos/etcd.git git clone https://github.com/coreos/etcd.git
cd etcd cd etcd
git checkout ab4bcc18694644d12f0c038339d8d039072502b1 git checkout ab4bcc18694644d12f0c038339d8d039072502b1

7
hack/test-go.sh
View File

@ -46,11 +46,12 @@ find_test_pkgs() {
# there is currently a race in the coverage code in tip. Remove this when it is fixed # 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. # see https://code.google.com/p/go/issues/detail?id=8630 for details.
if [[ "${TRAVIS_GO_VERSION}" -eq "tip" ]]; then if [ "${TRAVIS_GO_VERSION}" == "tip" ]; then
KUBE_COVER="" KUBE_COVER=""
else
# -covermode=atomic becomes default with -race in Go >=1.3
KUBE_COVER=${KUBE_COVER:--cover -covermode=atomic}
fi fi
# -covermode=atomic becomes default with -race in Go >=1.3
KUBE_COVER=${KUBE_COVER:--cover -covermode=atomic}
KUBE_TIMEOUT=${KUBE_TIMEOUT:--timeout 30s} KUBE_TIMEOUT=${KUBE_TIMEOUT:--timeout 30s}
cd "${KUBE_TARGET}" cd "${KUBE_TARGET}"

2
hack/verify-boilerplate.sh
View File

@ -18,7 +18,7 @@ REPO_ROOT="$(cd "$(dirname "$0")/../" && pwd -P)"
result=0 result=0
gofiles="$(find ${REPO_ROOT} -type f | grep "[.]go$" | grep -v "Godeps/\|third_party/\|release/\|_?output/|target/")" gofiles="$(find ${REPO_ROOT} -type f | grep "[.]go$" | grep -v "Godeps/\|third_party/\|release/\|_?output/|target/")"
for file in ${gofiles}; do for file in ${gofiles}; do
if [[ "$(${REPO_ROOT}/hooks/boilerplate.sh "${file}")" -eq "0" ]]; then if [[ "$(${REPO_ROOT}/hooks/boilerplate.sh "${file}")" -eq "0" ]]; then
echo "Boilerplate header is wrong for: ${file}" echo "Boilerplate header is wrong for: ${file}"