summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastiaan van Stijn <github@gone.nl>2020-06-03 10:26:41 +0200
committerSebastiaan van Stijn <github@gone.nl>2020-06-30 17:57:36 +0200
commit2c68b382a8847118fb11f40675823602d653357d (patch)
tree553fad6cb01e4a7cc76909df9537bcbbfb03b265
parent0a248c0906b4dd967bef5610e0d60cef7459ed12 (diff)
downloaddocker-py-2c68b382a8847118fb11f40675823602d653357d.tar.gz
Update test engine version to 19.03.12
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
-rw-r--r--Jenkinsfile4
-rw-r--r--Makefile2
2 files changed, 3 insertions, 3 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 8777214..88c2159 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,7 +31,7 @@ def buildImages = { ->
}
def getDockerVersions = { ->
- def dockerVersions = ["19.03.5"]
+ def dockerVersions = ["19.03.12"]
wrappedNode(label: "amd64 && ubuntu-1804 && overlay2") {
def result = sh(script: """docker run --rm \\
--entrypoint=python \\
@@ -66,7 +66,7 @@ def runTests = { Map settings ->
throw new Exception("Need test image object, e.g.: `runTests(testImage: img)`")
}
if (!dockerVersion) {
- throw new Exception("Need Docker version to test, e.g.: `runTests(dockerVersion: '1.12.3')`")
+ throw new Exception("Need Docker version to test, e.g.: `runTests(dockerVersion: '19.03.12')`")
}
if (!pythonVersion) {
throw new Exception("Need Python version being tested, e.g.: `runTests(pythonVersion: 'py2.7')`")
diff --git a/Makefile b/Makefile
index 551868e..4795c63 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ integration-test-py3: build-py3
docker run -t --rm -v /var/run/docker.sock:/var/run/docker.sock docker-sdk-python3 py.test -v tests/integration/${file}
TEST_API_VERSION ?= 1.35
-TEST_ENGINE_VERSION ?= 19.03.5
+TEST_ENGINE_VERSION ?= 19.03.12
.PHONY: setup-network
setup-network: