summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2017-08-17 12:38:24 -0700
committerJoffrey F <f.joffrey@gmail.com>2017-08-17 13:38:40 -0700
commit921aba107b75b4571d8e7391d199011e07048b8a (patch)
treeb8a86092dafefa8bf414d6459aaa848adcf2fef9
parentd9df2a8b75d8a36691a15cdb27213b1db5fa4a61 (diff)
downloaddocker-py-921aba107b75b4571d8e7391d199011e07048b8a.tar.gz
Update test versions
Signed-off-by: Joffrey F <joffrey@docker.com>
-rw-r--r--Jenkinsfile4
-rw-r--r--Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 9e1b491..6fa2728 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,7 +6,7 @@ def imageNamePy3
def images = [:]
-def dockerVersions = ["1.13.1", "17.04.0-ce", "17.05.0-ce", "17.06.0-ce"]
+def dockerVersions = ["1.13.1", "17.04.0-ce", "17.05.0-ce", "17.06.1-ce", "17.07.0-ce-rc3"]
def buildImage = { name, buildargs, pyTag ->
img = docker.image(name)
@@ -34,7 +34,7 @@ def buildImages = { ->
}
def getAPIVersion = { engineVersion ->
- def versionMap = ['1.13.': '1.26', '17.04': '1.27', '17.05': '1.29', '17.06': '1.30']
+ def versionMap = ['1.13.': '1.26', '17.04': '1.27', '17.05': '1.29', '17.06': '1.30', '17.07': '1.31']
return versionMap[engineVersion.substring(0, 5)]
}
diff --git a/Makefile b/Makefile
index e4cd3f7..c6c6d56 100644
--- a/Makefile
+++ b/Makefile
@@ -41,8 +41,8 @@ integration-test: build
integration-test-py3: build-py3
docker run --rm -v /var/run/docker.sock:/var/run/docker.sock docker-sdk-python3 py.test tests/integration/${file}
-TEST_API_VERSION ?= 1.29
-TEST_ENGINE_VERSION ?= 17.05.0-ce
+TEST_API_VERSION ?= 1.30
+TEST_ENGINE_VERSION ?= 17.06.0-ce
.PHONY: integration-dind
integration-dind: build build-py3