tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prepare drop of python 2.x support 

see https://github.com/docker/compose/issues/6890

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2019-11-19 17:26:34 +01:00
parent 2887d82d16
commit 9ad10575d1
No known key found for this signature in database
GPG Key ID: 9858809D6F8F6E7E
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Jenkinsfile vendored
View File

@ -31,7 +31,7 @@ def get_versions = { String imageId, int number ->
def docker_versions def docker_versions
wrappedNode(label: "ubuntu && amd64 && !zfs") { wrappedNode(label: "ubuntu && amd64 && !zfs") {
def result = sh(script: """docker run --rm \\ def result = sh(script: """docker run --rm \\
--entrypoint=/code/.tox/py27/bin/python \\ --entrypoint=/code/.tox/py37/bin/python \\
${imageId} \\ ${imageId} \\
/code/script/test/versions.py -n ${number} docker/docker-ce recent /code/script/test/versions.py -n ${number} docker/docker-ce recent
""", returnStdout: true """, returnStdout: true
@ -48,7 +48,7 @@ def runTests = { Map settings ->
def imageName = settings.get("image", null) def imageName = settings.get("image", null)
if (!pythonVersions) { 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) { if (!dockerVersions) {
throw new Exception("Need Docker versions to test. e.g.: `runTests(dockerVersions: 'all')`") 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 testMatrix = [failFast: true]
def baseImages = ['alpine', 'debian'] def baseImages = ['alpine', 'debian']
def pythonVersions = ['py27', 'py37']
baseImages.each { baseImage -> baseImages.each { baseImage ->
def imageName = buildImage(baseImage) def imageName = buildImage(baseImage)
get_versions(imageName, 2).each { dockerVersion -> get_versions(imageName, 2).each { dockerVersion ->
pythonVersions.each { pyVersion -> testMatrix["${baseImage}_${dockerVersion}"] = runTests([baseImage: baseImage, image: imageName, dockerVersions: dockerVersion, pythonVersions: 'py37'])
testMatrix["${baseImage}_${dockerVersion}_${pyVersion}"] = runTests([baseImage: baseImage, image: imageName, dockerVersions: dockerVersion, pythonVersions: pyVersion])
}
} }
} }