Kaydet (Commit) 2b128077 authored tarafından Joffrey F's avatar Joffrey F Kaydeden (comit) Joffrey F

Shift test matrix forward

Signed-off-by: 's avatarJoffrey F <joffrey@docker.com>
üst eb0d8064
...@@ -7,7 +7,7 @@ def images = [:] ...@@ -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 = { -> ...@@ -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 -> ...@@ -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} \\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment