From abebb0f197f37179aa78da4f4447dde905e9cdaf Mon Sep 17 00:00:00 2001
From: Tom Wilkie <tom.wilkie@gmail.com>
Date: Mon, 4 Jan 2016 15:52:10 +0000
Subject: [PATCH] Build new test VM (to pickup latest Docker version).

---
 circle.yml         | 4 +++-
 integration/gce.sh | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/circle.yml b/circle.yml
index e11bc1f87..a86a2c9ae 100644
--- a/circle.yml
+++ b/circle.yml
@@ -18,7 +18,7 @@ machine:
 dependencies:
   cache_directories:
     - "~/docker"
-  post:
+  override:
     - "sudo apt-get update && sudo apt-get install jq pv"
     - curl https://sdk.cloud.google.com | bash
     - test -z "$SECRET_PASSWORD" || bin/setup-circleci-secrets "$SECRET_PASSWORD"
@@ -28,6 +28,8 @@ dependencies:
     - "cd $SRCDIR/client; ../tools/rebuild-image weaveworks/scope-ui-build . Dockerfile package.json webpack.production.config.js .eslintrc .babelrc && touch $SRCDIR/.scope_ui_build.uptodate"
     - "cd $SRCDIR/backend; ../tools/rebuild-image weaveworks/scope-backend-build . Dockerfile build.sh && touch $SRCDIR/.scope_backend_build.uptodate"
     - "make -C $SRCDIR/tools/runner && mkdir -p $WEAVE_ROOT/tools/runner && cp $SRCDIR/tools/runner/runner $WEAVE_ROOT/tools/runner"
+    - cd $SRCDIR/integration; ./gce.sh make_template:
+        parallel: false
 
 test:
   override:
diff --git a/integration/gce.sh b/integration/gce.sh
index 2c78a42de..d80c55a95 100755
--- a/integration/gce.sh
+++ b/integration/gce.sh
@@ -5,6 +5,6 @@ set -e
 . ./config.sh
 
 export PROJECT=scope-integration-tests
-export TEMPLATE_NAME="test-template-3"
+export TEMPLATE_NAME="test-template-4"
 export NUM_HOSTS=2
 . "$WEAVE_ROOT/test/gce.sh" "$@"