From 16794d1d236e7a2576af4fc1493dd3644e3820fb Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 10 Aug 2019 19:19:32 +0200 Subject: [PATCH 1/2] Jenkinsfile: update API version matrix; set default to v1.40 - Added new entry for Docker 19.03 - Removed obsolete engine versions that reached EOL (both as Community Edition and Enterprise Edition) - Set the fallback/default API version to v1.40, which corresponds with Docker 19.03 (current release) Signed-off-by: Sebastiaan van Stijn --- Jenkinsfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e618c5dd..a0f983c2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -46,12 +46,14 @@ def getDockerVersions = { -> def getAPIVersion = { engineVersion -> def versionMap = [ - '17.06': '1.30', '17.12': '1.35', '18.02': '1.36', '18.03': '1.37', - '18.06': '1.38', '18.09': '1.39' + '17.06': '1.30', + '18.03': '1.37', + '18.09': '1.39', + '19.03': '1.40' ] def result = versionMap[engineVersion.substring(0, 5)] if (!result) { - return '1.39' + return '1.40' } return result } From f0fc266eb503eab979492bcfaf504348dc8ca239 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 10 Aug 2019 19:22:52 +0200 Subject: [PATCH 2/2] Jenkinsfile: update python 3.6 -> 3.7 Signed-off-by: Sebastiaan van Stijn --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a0f983c2..e879eb43 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,7 +25,7 @@ def buildImages = { -> imageNamePy3 = "${imageNameBase}:py3-${gitCommit()}" buildImage(imageNamePy2, "-f tests/Dockerfile --build-arg PYTHON_VERSION=2.7 .", "py2.7") - buildImage(imageNamePy3, "-f tests/Dockerfile --build-arg PYTHON_VERSION=3.6 .", "py3.6") + buildImage(imageNamePy3, "-f tests/Dockerfile --build-arg PYTHON_VERSION=3.7 .", "py3.7") } } }