Merge remote-tracking branch 'origin/1.9'
This commit is contained in:
commit
fa08bb9df6
2 files changed
+2
-2
No files matched your search
+1
-1
@@ -11,7 +11,7 @@ machine:
|
|||||||
environment:
|
environment:
|
||||||
GOPATH: /home/ubuntu:$GOPATH
|
GOPATH: /home/ubuntu:$GOPATH
|
||||||
SRCDIR: /home/ubuntu/src/github.com/weaveworks/weave
|
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
|
CLOUDSDK_CORE_DISABLE_PROMPTS: 1
|
||||||
STATE: /home/ubuntu/state.env
|
STATE: /home/ubuntu/state.env
|
||||||
# Base name of VMs for integration tests:
|
# Base name of VMs for integration tests:
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ function print_vars() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function verify_dependencies() {
|
function verify_dependencies() {
|
||||||
local deps=(python terraform ansible-playbook)
|
local deps=(python terraform ansible-playbook gcloud)
|
||||||
for dep in "${deps[@]}"; do
|
for dep in "${deps[@]}"; do
|
||||||
if [ ! "$(which "$dep")" ]; then
|
if [ ! "$(which "$dep")" ]; then
|
||||||
echo >&2 "$dep is not installed or not in PATH."
|
echo >&2 "$dep is not installed or not in PATH."
|
||||||
|
|||||||
Reference in new issue
Block a user