From 8bd747a9046c406984982972e911ce6480775811 Mon Sep 17 00:00:00 2001
From: Johan Euphrosine <proppy@google.com>
Date: Thu, 12 Jun 2014 13:49:36 -0700
Subject: [PATCH 1/7] add travis integration

---
 .travis.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000000..17c58d1d60d
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,14 @@
+language: go
+
+go:
+  - 1.2
+  - tip
+
+install: 
+  - bad=$(gofmt -s -l pkg/ cmd/) bash -x -c '[[ -z "$bad" ]]'
+  - ./hack/build-go.sh
+
+script:
+  - ./hack/test-go.sh
+  - ./hack/integration-test.sh
+  - ./hack/e2e-test.sh

From 200fc2dd29769a86c926c28050329ec5febb9bab Mon Sep 17 00:00:00 2001
From: Johan Euphrosine <proppy@google.com>
Date: Thu, 12 Jun 2014 14:35:11 -0700
Subject: [PATCH 2/7] travis: add cloudsdk and cover tool

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 17c58d1d60d..c58b7b76d24 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,8 @@ go:
   - tip
 
 install: 
+  - go get code.google.com/p/go.tools/cmd/cover
+  - curl https://sdk.cloud.google.com | CLOUDSDK_CORE_DISABLE_PROMPTS=1 bash
   - bad=$(gofmt -s -l pkg/ cmd/) bash -x -c '[[ -z "$bad" ]]'
   - ./hack/build-go.sh
 

From ac14b2b9dd8fbc630b44bca0ab47f4d04e841d37 Mon Sep 17 00:00:00 2001
From: Johan Euphrosine <proppy@google.com>
Date: Thu, 12 Jun 2014 15:09:22 -0700
Subject: [PATCH 3/7] travis: add etcd and gcloud path

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index c58b7b76d24..d92aec90193 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,11 +6,13 @@ go:
 
 install: 
   - go get code.google.com/p/go.tools/cmd/cover
+  - go get github.com/coreos/etcd
   - curl https://sdk.cloud.google.com | CLOUDSDK_CORE_DISABLE_PROMPTS=1 bash
   - bad=$(gofmt -s -l pkg/ cmd/) bash -x -c '[[ -z "$bad" ]]'
   - ./hack/build-go.sh
 
 script:
+  - . /home/travis/google-cloud-sdk/path.bash.inc
   - ./hack/test-go.sh
   - ./hack/integration-test.sh
   - ./hack/e2e-test.sh

From 0563f5d2b1a0eeabab5d747580560c2b5f4e4d1e Mon Sep 17 00:00:00 2001
From: Johan Euphrosine <proppy@google.com>
Date: Thu, 12 Jun 2014 15:40:08 -0700
Subject: [PATCH 4/7] travis: fix integration test invocation

---
 .travis.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d92aec90193..e761daeb5ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,6 @@ install:
   - ./hack/build-go.sh
 
 script:
-  - . /home/travis/google-cloud-sdk/path.bash.inc
   - ./hack/test-go.sh
-  - ./hack/integration-test.sh
-  - ./hack/e2e-test.sh
+  - bash --init-file /home/travis/google-cloud-sdk/path.bash.inc ./hack/integration-test.sh
+  - bash --init-file /home/travis/google-cloud-sdk/path.bash.inc ./hack/e2e-test.sh

From 0d9280e1683dc244dc647151352cf36bc09f2a1e Mon Sep 17 00:00:00 2001
From: Johan Euphrosine <proppy@google.com>
Date: Thu, 12 Jun 2014 15:44:27 -0700
Subject: [PATCH 5/7] travis: remove e2e test and set GOPATH for integration

---
 .travis.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e761daeb5ce..ce97dbe0036 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,11 +7,9 @@ go:
 install: 
   - go get code.google.com/p/go.tools/cmd/cover
   - go get github.com/coreos/etcd
-  - curl https://sdk.cloud.google.com | CLOUDSDK_CORE_DISABLE_PROMPTS=1 bash
   - bad=$(gofmt -s -l pkg/ cmd/) bash -x -c '[[ -z "$bad" ]]'
   - ./hack/build-go.sh
 
 script:
   - ./hack/test-go.sh
-  - bash --init-file /home/travis/google-cloud-sdk/path.bash.inc ./hack/integration-test.sh
-  - bash --init-file /home/travis/google-cloud-sdk/path.bash.inc ./hack/e2e-test.sh
+  - PATH=$GOPATH/bin ./hack/integration-test.sh

From 1b60c4d88fd5eb015045c95814869be5104ac0c7 Mon Sep 17 00:00:00 2001
From: Johan Euphrosine <proppy@google.com>
Date: Thu, 12 Jun 2014 16:05:05 -0700
Subject: [PATCH 6/7] travis: fix path for integration

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ce97dbe0036..1fcc93396c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,4 +12,4 @@ install:
 
 script:
   - ./hack/test-go.sh
-  - PATH=$GOPATH/bin ./hack/integration-test.sh
+  - PATH=$GOPATH/bin:$PATH ./hack/integration-test.sh

From afc3fe7edf3bf5cac5788c53acb27e5c17ee40ec Mon Sep 17 00:00:00 2001
From: Johan Euphrosine <proppy@google.com>
Date: Thu, 12 Jun 2014 16:07:44 -0700
Subject: [PATCH 7/7] travis: explicit gopath

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1fcc93396c0..0b3eaed3803 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,4 +12,4 @@ install:
 
 script:
   - ./hack/test-go.sh
-  - PATH=$GOPATH/bin:$PATH ./hack/integration-test.sh
+  - PATH=$HOME/gopath/bin:$PATH ./hack/integration-test.sh