From 75d80c48288178d4c10fa6bb0b925ae73dd2c4a1 Mon Sep 17 00:00:00 2001
From: Martynas Pumputis <martynasp@gmail.com>
Date: Fri, 7 Apr 2017 14:43:35 +0100
Subject: [PATCH 1/2] Add /opt/google-cloud-sk/bin to PATH of circle.yml

Otherwise, "gcloud" cannot be found.
---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 39740407..d85b5922 100644
--- a/circle.yml
+++ b/circle.yml
@@ -11,7 +11,7 @@ machine:
   environment:
     GOPATH: /home/ubuntu:$GOPATH
     SRCDIR: /home/ubuntu/src/github.com/weaveworks/weave
-    PATH: $PATH:$HOME/.local/bin
+    PATH: $PATH:$HOME/.local/bin:/opt/google-cloud-sdk/bin
     CLOUDSDK_CORE_DISABLE_PROMPTS: 1
     STATE: /home/ubuntu/state.env
     # Base name of VMs for integration tests:

From 953d45110576bf288533d052a41b9e59179ea3b0 Mon Sep 17 00:00:00 2001
From: Martynas Pumputis <martynasp@gmail.com>
Date: Fri, 7 Apr 2017 14:44:31 +0100
Subject: [PATCH 2/2] Check for gcloud in verify_dependencies

In CI builds, we rely on gcloud installed by Circle CI. Any change to
Circle $PATH or the installation might break CI builds in non-obvious
way.
---
 test/run-integration-tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/run-integration-tests.sh b/test/run-integration-tests.sh
index 1e22480d..a167e464 100755
--- a/test/run-integration-tests.sh
+++ b/test/run-integration-tests.sh
@@ -65,7 +65,7 @@ function print_vars() {
 }
 
 function verify_dependencies() {
-    local deps=(python terraform ansible-playbook)
+    local deps=(python terraform ansible-playbook gcloud)
     for dep in "${deps[@]}"; do
         if [ ! "$(which "$dep")" ]; then
             echo >&2 "$dep is not installed or not in PATH."