From dd889b990b723edf08c21b7442d02f603cf8eec1 Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Tue, 19 Nov 2019 17:26:34 +0100 Subject: [PATCH] Prepare drop of python 2.x support see https://github.com/docker/compose/issues/6890 Signed-off-by: Nicolas De Loof --- Jenkinsfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1d7c348e3..db9f601d7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -48,7 +48,7 @@ def runTests = { Map settings -> def imageName = settings.get("image", null) if (!pythonVersions) { - throw new Exception("Need Python versions to test. e.g.: `runTests(pythonVersions: 'py27,py37')`") + throw new Exception("Need Python versions to test. e.g.: `runTests(pythonVersions: 'py37')`") } if (!dockerVersions) { throw new Exception("Need Docker versions to test. e.g.: `runTests(dockerVersions: 'all')`") @@ -82,13 +82,10 @@ def runTests = { Map settings -> def testMatrix = [failFast: true] def baseImages = ['alpine', 'debian'] -def pythonVersions = ['py27', 'py37'] baseImages.each { baseImage -> def imageName = buildImage(baseImage) get_versions(imageName, 2).each { dockerVersion -> - pythonVersions.each { pyVersion -> - testMatrix["${baseImage}_${dockerVersion}_${pyVersion}"] = runTests([baseImage: baseImage, image: imageName, dockerVersions: dockerVersion, pythonVersions: pyVersion]) - } + testMatrix["${baseImage}_${dockerVersion}"] = runTests([baseImage: baseImage, image: imageName, dockerVersions: dockerVersion, pythonVersions: 'py37']) } }