diff options
| author | Joffrey F <joffrey@docker.com> | 2017-06-22 16:42:15 -0700 |
|---|---|---|
| committer | Joffrey F <f.joffrey@gmail.com> | 2017-08-17 13:38:40 -0700 |
| commit | 2b128077c1fffc0d9f308dc31543bb602b599282 (patch) | |
| tree | dca43e76517f68a4e001b0fb550eb9868e1b1d3f /Jenkinsfile | |
| parent | eb0d80646aab85b2ed555a54c2d3dffe2c7be150 (diff) | |
| download | docker-py-2b128077c1fffc0d9f308dc31543bb602b599282.tar.gz | |
Shift test matrix forward
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'Jenkinsfile')
| -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} \\ |