Browse code

Use the vendored version of etcd

Clayton Coleman authored on 2014/09/05 05:31:16
Showing 3 changed files
... ...
@@ -1,5 +1,6 @@
1 1
 /output
2 2
 /third_party/pkg
3
+/third_party/etcd
3 4
 /*.etcd
4 5
 .project
5 6
 .vagrant
... ...
@@ -7,15 +7,15 @@ go:
7 7
 
8 8
 install:
9 9
   - ./hack/verify-gofmt.sh
10
+  - ./hack/install-etcd.sh
10 11
   - ./hack/install-std-race.sh
11 12
   - go get code.google.com/p/go.tools/cmd/cover
12
-  - go get github.com/coreos/etcd
13 13
   - ./hack/build-go.sh
14 14
 
15 15
 script:
16 16
   - ./hack/test-go.sh
17 17
   - ./hack/test-cmd.sh
18
-  - PATH=$HOME/gopath/bin:$PATH ./hack/test-integration.sh
18
+  - PATH=$HOME/gopath/bin:./third_party/etcd/bin:$PATH ./hack/test-integration.sh
19 19
 
20 20
 notifications:
21 21
   irc: "chat.freenode.net#openshift-dev"
22 22
new file mode 100755
... ...
@@ -0,0 +1,11 @@
0
+#!/bin/bash
1
+
2
+hackdir=$(CDPATH="" cd $(dirname $0); pwd)
3
+
4
+mkdir -p third_party
5
+cd third_party
6
+git clone https://github.com/coreos/etcd.git
7
+cd etcd
8
+git checkout $(go run ${hackdir}/version.go ${hackdir}/../Godeps/Godeps.json github.com/coreos/etcd/server)
9
+./build
10
+