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

Merge pull request #1664 from docker/jfile-17.06-rc 

Shift test matrix forward
This commit is contained in:
Joffrey F 2017-07-03 16:33:18 -07:00 committed by GitHub
parent 03b78b8152 f4a4982ae0
commit 6fe1c7f18f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Jenkinsfile vendored
View File

@ -7,7 +7,7 @@ def images = [:]
// Note: Swarm in dind seem notoriously flimsy with 1.12.1+, which is why we're // Note: Swarm in dind seem notoriously flimsy with 1.12.1+, which is why we're
// sticking with 1.12.0 for the 1.12 series // sticking with 1.12.0 for the 1.12 series
def dockerVersions = ["1.12.0", "1.13.1", "17.04.0-ce", "17.05.0-ce"] def dockerVersions = ["1.13.1", "17.04.0-ce", "17.05.0-ce", "17.06.0-ce-rc5"]
def buildImage = { name, buildargs, pyTag -> def buildImage = { name, buildargs, pyTag ->
img = docker.image(name) img = docker.image(name)
@ -35,7 +35,7 @@ def buildImages = { ->
} }
def getAPIVersion = { engineVersion -> def getAPIVersion = { engineVersion ->
def versionMap = ['1.12.': '1.24', '1.13.': '1.26', '17.04': '1.27', '17.05': '1.29'] def versionMap = ['1.13.': '1.26', '17.04': '1.27', '17.05': '1.29', '17.06': '1.30']
return versionMap[engineVersion.substring(0, 5)] return versionMap[engineVersion.substring(0, 5)]
} }
@ -63,7 +63,7 @@ def runTests = { Map settings ->
def testContainerName = "dpy-tests-\$BUILD_NUMBER-\$EXECUTOR_NUMBER-${pythonVersion}-${dockerVersion}" def testContainerName = "dpy-tests-\$BUILD_NUMBER-\$EXECUTOR_NUMBER-${pythonVersion}-${dockerVersion}"
try { try {
sh """docker run -d --name ${dindContainerName} -v /tmp --privileged \\ sh """docker run -d --name ${dindContainerName} -v /tmp --privileged \\
dockerswarm/dind:${dockerVersion} docker daemon -H tcp://0.0.0.0:2375 dockerswarm/dind:${dockerVersion} dockerd -H tcp://0.0.0.0:2375
""" """
sh """docker run \\ sh """docker run \\
--name ${testContainerName} --volumes-from ${dindContainerName} \\ --name ${testContainerName} --volumes-from ${dindContainerName} \\