From ab2d18851f9c42153d8460494c4020ea0ca5f079 Mon Sep 17 00:00:00 2001
From: Aanand Prasad <aanand.prasad@gmail.com>
Date: Fri, 15 Jan 2016 00:12:07 +0000
Subject: Test against a dev build of Engine 1.10

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
---
 script/test-versions | 12 +++++++++---
 tox.ini              |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/script/test-versions b/script/test-versions
index 76e55e11..24412b91 100755
--- a/script/test-versions
+++ b/script/test-versions
@@ -18,8 +18,7 @@ get_versions="docker run --rm
 if [ "$DOCKER_VERSIONS" == "" ]; then
   DOCKER_VERSIONS="$($get_versions default)"
 elif [ "$DOCKER_VERSIONS" == "all" ]; then
-  # TODO: `-n 2` when engine 1.10 releases
-  DOCKER_VERSIONS="$($get_versions recent -n 1)"
+  DOCKER_VERSIONS="1.9.1 1.10.0-dev"
 fi
 
 
@@ -39,12 +38,18 @@ for version in $DOCKER_VERSIONS; do
 
   trap "on_exit" EXIT
 
+  if [[ $version == *"-dev" ]]; then
+    repo="dnephin/dind"
+  else
+    repo="dockerswarm/dind"
+  fi
+
   docker run \
     -d \
     --name "$daemon_container" \
     --privileged \
     --volume="/var/lib/docker" \
-    dockerswarm/dind:$version \
+    "$repo:$version" \
     docker daemon -H tcp://0.0.0.0:2375 $DOCKER_DAEMON_ARGS \
     2>&1 | tail -n 10
 
@@ -52,6 +57,7 @@ for version in $DOCKER_VERSIONS; do
     --rm \
     --link="$daemon_container:docker" \
     --env="DOCKER_HOST=tcp://docker:2375" \
+    --env="DOCKER_VERSION=$version" \
     --entrypoint="tox" \
     "$TAG" \
     -e py27,py34 -- "$@"
diff --git a/tox.ini b/tox.ini
index 9d45b0c7..dc85bc6d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,6 +8,7 @@ passenv =
     DOCKER_HOST
     DOCKER_CERT_PATH
     DOCKER_TLS_VERIFY
+    DOCKER_VERSION
 setenv =
     HOME=/tmp
 deps =
-- 
cgit v1.2.3