Merge pull request spotify#848 from spotify/dxia/update-versions

Test on latest docker versions
ankitbansal · Aug 14, 2017 · 37e7393 · 37e7393
2 parents 38f56b2 + e903411
commit 37e7393
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/.travis.sh b/.travis.sh
@@ -58,10 +58,8 @@ case "$1" in
     # Give it time to be ready
     sleep 10
 
-    if [[ "$ENABLE_SWARM" = "1"  ]]; then
-        # initialize docker swarm to be able to run docker tests
-        sudo docker swarm init --advertise-addr 127.0.0.1
-    fi
+    # initialize docker swarm to be able to run docker tests
+    sudo docker swarm init --advertise-addr 127.0.0.1
 
     # Wait a minute so we can see more docker logs in case something goes wrong
     sleep 60

diff --git a/.travis.yml b/.travis.yml
@@ -17,13 +17,12 @@ env:
     - SONATYPE_USERNAME=mattbrownspotify
     - secure: "CTYWMDSX4LOz2TiYBSqC+7klvafj0wvwcbpyL3TJueWmgKzJwysRqSHxw9JR2rfe8ysSxGFFiRO9HEyJ4o6zTF6kIy9tYsPxvSJ8c9wIEdTbUtGMuWlrhKchuMmdDaWt07/0N2llSB4h3fv53UGglSM+5FJu4e5DxvxUmIx/Zn4="
   matrix:
-    - DOCKER_VERSION=1.11.2
-    - DOCKER_VERSION=1.12.6 ENABLE_SWARM=1
-    - DOCKER_VERSION=1.13.1 ENABLE_SWARM=1
-    - DOCKER_VERSION=17.03.1~ce ENABLE_SWARM=1
-    - DOCKER_VERSION=17.04.0~ce ENABLE_SWARM=1
-    - DOCKER_VERSION=17.05.0~ce ENABLE_SWARM=1 UPLOAD_SONATYPE=1
-    - DOCKER_VERSION=17.06.0~ce DOCKER_CE=1 ENABLE_SWARM=1
+    - DOCKER_VERSION=1.12.6
+    - DOCKER_VERSION=1.13.1
+    - DOCKER_VERSION=17.03.1~ce
+    - DOCKER_VERSION=17.04.0~ce
+    - DOCKER_VERSION=17.05.0~ce
+    - DOCKER_VERSION=17.06.0~ce DOCKER_CE=1 UPLOAD_SONATYPE=1
 
 before_install:
   # check what version of docker is installed beforehand