Skip to content

Commit

Permalink
Merge branch 'py2' into remove_python2
Browse files Browse the repository at this point in the history
  • Loading branch information
venthur authored Nov 20, 2019
2 parents 0931375 + c4acf41 commit dca8bef
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,10 @@ def runTests = { Map settings ->

def testMatrix = [failFast: true]
def baseImages = ['alpine', 'debian']
def pythonVersions = ['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'])
}
}

Expand Down

0 comments on commit dca8bef

Please sign in to comment.