diff options
| author | Joffrey F <joffrey@docker.com> | 2017-01-26 16:14:57 -0800 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2017-01-27 16:00:18 -0800 |
| commit | 847f209865cb7c9234cd19a9ae8cc9a158d9a140 (patch) | |
| tree | 50583634f742f10cf266cdb57f938fa0c446a40b /Jenkinsfile | |
| parent | 0186456f3c4d81843667cc62e2816472cbf007e0 (diff) | |
| download | docker-py-847f209865cb7c9234cd19a9ae8cc9a158d9a140.tar.gz | |
Add stop_timeout to create_container
Fix requires_api_version test decorator
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'Jenkinsfile')
| -rw-r--r-- | Jenkinsfile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index bc4cc06..b8b932a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,15 +36,14 @@ def buildImages = { -> def getAPIVersion = { engineVersion -> def versionMap = ['1.12': '1.24', '1.13': '1.25'] - - engineVersion = engineVersion.substring(0, 4) - return versionMap[engineVersion] + return versionMap[engineVersion.substring(0, 4)] } def runTests = { Map settings -> def dockerVersion = settings.get("dockerVersion", null) def pythonVersion = settings.get("pythonVersion", null) def testImage = settings.get("testImage", null) + def apiVersion = getAPIVersion(dockerVersion) if (!testImage) { throw new Exception("Need test image object, e.g.: `runTests(testImage: img)`") @@ -62,7 +61,6 @@ def runTests = { Map settings -> checkout(scm) def dindContainerName = "dpy-dind-\$BUILD_NUMBER-\$EXECUTOR_NUMBER-${pythonVersion}-${dockerVersion}" def testContainerName = "dpy-tests-\$BUILD_NUMBER-\$EXECUTOR_NUMBER-${pythonVersion}-${dockerVersion}" - def apiVersion = getAPIVersion(dockerVersion) try { sh """docker run -d --name ${dindContainerName} -v /tmp --privileged \\ dockerswarm/dind:${dockerVersion} docker daemon -H tcp://0.0.0.0:2375 |