diff options
| author | Joffrey F <joffrey@docker.com> | 2017-06-22 16:42:15 -0700 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2017-06-27 12:28:16 -0700 |
| commit | f4a4982ae05b6824372ff681b8ff5c30ea4ac80c (patch) | |
| tree | 46f811b7f58038505d3d550b99ee726ec497e9f7 | |
| parent | 15030cb6806f49e687e8dc7c33808cd8a010f6dc (diff) | |
| download | docker-py-jfile-17.06-rc.tar.gz | |
Shift test matrix forwardjfile-17.06-rc
Signed-off-by: Joffrey F <joffrey@docker.com>
| -rw-r--r-- | Jenkinsfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 987df7a..3579278 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,7 +7,7 @@ def images = [:] // 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 -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 -> img = docker.image(name) @@ -35,7 +35,7 @@ def buildImages = { -> } 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)] } @@ -63,7 +63,7 @@ def runTests = { Map settings -> def testContainerName = "dpy-tests-\$BUILD_NUMBER-\$EXECUTOR_NUMBER-${pythonVersion}-${dockerVersion}" try { 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 \\ --name ${testContainerName} --volumes-from ${dindContainerName} \\ |