From 65ba043d158792ea7a596f306293a6503cc12e9a Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 25 Oct 2017 15:14:19 -0700
Subject: [PATCH] Update test engine versions in Jenkinsfile

Signed-off-by: Joffrey F <joffrey@docker.com>

Conflicts:
	Jenkinsfile
---
 Jenkinsfile                         | 4 ++--
 Makefile                            | 4 ++--
 tests/integration/api_build_test.py | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 178653a87..e3168cd70 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,7 +5,7 @@ def imageNamePy2
 def imageNamePy3
 def images = [:]
 
-def dockerVersions = ["1.13.1", "17.04.0-ce", "17.05.0-ce", "17.06.0-ce", "17.07.0-ce-rc3"]
+def dockerVersions = ["17.06.2-ce", "17.09.0-ce", "17.10.0-ce"]
 
 def buildImage = { name, buildargs, pyTag ->
   img = docker.image(name)
@@ -33,7 +33,7 @@ def buildImages = { ->
 }
 
 def getAPIVersion = { engineVersion ->
-  def versionMap = ['1.13.': '1.26', '17.04': '1.27', '17.05': '1.29', '17.06': '1.30', '17.07': '1.31']
+  def versionMap = ['17.06': '1.30', '17.09': '1.32', '17.10': '1.33']
   return versionMap[engineVersion.substring(0, 5)]
 }
 
diff --git a/Makefile b/Makefile
index efa4232e9..32ef51067 100644
--- a/Makefile
+++ b/Makefile
@@ -41,8 +41,8 @@ integration-test: build
 integration-test-py3: build-py3
 	docker run -t --rm -v /var/run/docker.sock:/var/run/docker.sock docker-sdk-python3 py.test tests/integration/${file}
 
-TEST_API_VERSION ?= 1.30
-TEST_ENGINE_VERSION ?= 17.06.0-ce
+TEST_API_VERSION ?= 1.33
+TEST_ENGINE_VERSION ?= 17.10.0-ce
 
 .PHONY: integration-dind
 integration-dind: build build-py3
diff --git a/tests/integration/api_build_test.py b/tests/integration/api_build_test.py
index 7a0e6b16b..8e98cc9fa 100644
--- a/tests/integration/api_build_test.py
+++ b/tests/integration/api_build_test.py
@@ -210,7 +210,7 @@ def test_build_container_with_target(self):
             pass
 
         info = self.client.inspect_image('build1')
-        self.assertEqual(info['Config']['OnBuild'], [])
+        assert not info['Config']['OnBuild']
 
     @requires_api_version('1.25')
     def test_build_with_network_mode(self):