From 1d2a5c65448e49bcf8a4772754f57bcd1631a7c6 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Sat, 25 Aug 2018 17:04:36 +0000
Subject: [PATCH] Set up dependencies for integration test job

* Build 'runner' program in build job and save to workspace;
* Save build outputs - externalui, staticui, codecgen output;
* Install required tools in test VM;
* Call 'make deps' in integration-tests-job and touch 'runner' from
  workspace so it doesn't rebuild.
---
 .circleci/config.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 53d5bdea9..081bf5a04 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -110,11 +110,17 @@ jobs:
           at: .
       - run: make BUILD_IN_CONTAINER=false SUDO= static all
       - run: cd extras; make BUILD_IN_CONTAINER=false
+      - run: make -C tools/runner
       - persist_to_workspace:
           root: .
           paths:
           - scope.tar
           - cloud-agent.tar
+          - tools/runner/runner
+          - prog/externalui/
+          - prog/staticui/
+          - report/report.codecgen.go
+          - render/detailed/detailed.codecgen.go
 
   integration-tests:
     machine:
@@ -129,10 +135,15 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
+      - run: |
+          sudo apt-get update
+          sudo apt-get install python-pip jq pv
+          sudo pip install awscli
       # kick off creation of test VMs
       - run: test -z "$SECRET_PASSWORD" || bin/setup-circleci-secrets "$SECRET_PASSWORD"
       - run: test -z "$SECRET_PASSWORD" || (cd $SRCDIR/integration; ./gce.sh make_template)
       - run: test -z "$SECRET_PASSWORD" || (cd $SRCDIR/integration; ./gce.sh setup && eval $(./gce.sh hosts); ./setup.sh)
+      - run: make deps; touch tools/runner/runner
       - run:
           command: test -z "$SECRET_PASSWORD" || (cd $SRCDIR/integration; eval $(./gce.sh hosts); ./run_all.sh)
           no_output_timeout: 5m