From 28633003d57224a369115efe8de351c38dbc6f94 Mon Sep 17 00:00:00 2001
From: Michael Hobbs <michaelshanehobbs@gmail.com>
Date: Wed, 6 Jan 2016 19:35:30 -0800
Subject: [PATCH] fix docker version and add back some deploy tests that test
 dokku functionality

---
 circle.yml                  | 4 ++--
 tests/apps/multi/Gemfile    | 2 +-
 tests/ci/parallel_runner.sh | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/circle.yml b/circle.yml
index 73ab55232..d3b2acfa2 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,7 +1,7 @@
 machine:
   pre:
     - echo 'DOCKER_OPTS="-s btrfs -e lxc -D --userland-proxy=false"' | sudo tee -a /etc/default/docker
-    - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.0-circleci'
+    - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci-cp-workaround'
     - sudo chmod 0755 /usr/bin/docker
   services:
     - docker
@@ -14,4 +14,4 @@ dependencies:
     - sudo -E make -e lint
 test:
   override:
-    - ./tests/ci/parallel_runner.sh testing: { parallel: true, timeout: 1800 }
+    - ./tests/ci/parallel_runner.sh testing: { parallel: true, timeout: 3600 }
diff --git a/tests/apps/multi/Gemfile b/tests/apps/multi/Gemfile
index d7723c6c4..6d078ad4d 100644
--- a/tests/apps/multi/Gemfile
+++ b/tests/apps/multi/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-ruby '1.9.3'
+ruby '2.2.4'
 
 gem 'compass', ">= 1.0.1"
 gem 'sass-globbing'
diff --git a/tests/ci/parallel_runner.sh b/tests/ci/parallel_runner.sh
index 8e38bbcf9..cd97c8a8b 100755
--- a/tests/ci/parallel_runner.sh
+++ b/tests/ci/parallel_runner.sh
@@ -52,6 +52,8 @@ case "$CIRCLE_NODE_INDEX" in
   2)
     echo "=====> make unit-tests (3/4) on CIRCLE_NODE_INDEX: $CIRCLE_NODE_INDEX"
     sudo -E UNIT_TEST_BATCH=3 make -e unit-tests
+    echo "=====> make deploy tests"
+    sudo -E make -e deploy-test-checks-root deploy-test-config deploy-test-multi
     ;;
 
   3)