diff options
| author | Joffrey F <joffrey@docker.com> | 2018-03-15 14:37:02 -0700 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2018-03-15 15:35:35 -0700 |
| commit | 59dd33672a3e25108b372b948f85e856609bea35 (patch) | |
| tree | 78e444f74eb51b5a1221d3c5cb5fb04e78e2c4fc /Jenkinsfile | |
| parent | 02f8d6a5e4f376f65f30895ca2d02b7564d8ad51 (diff) | |
| download | docker-py-tests_improvements.tar.gz | |
Use networks instead of legacy links for test setuptests_improvements
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'Jenkinsfile')
| -rw-r--r-- | Jenkinsfile | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index c548492..1323f4b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ def dockerVersions = [ "17.06.2-ce", // Latest EE "17.12.1-ce", // Latest CE stable "18.02.0-ce", // Latest CE edge - "18.03.0-ce-rc1" // Latest CE RC + "18.03.0-ce-rc4" // Latest CE RC ] def buildImage = { name, buildargs, pyTag -> @@ -64,15 +64,18 @@ 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 testNetwork = "dpy-testnet-\$BUILD_NUMBER-\$EXECUTOR_NUMBER-${pythonVersion}-${dockerVersion}" try { - sh """docker run -d --name ${dindContainerName} -v /tmp --privileged \\ + sh """docker network create ${testNetwork}""" + sh """docker run -d --name ${dindContainerName} -v /tmp --privileged --network ${testNetwork} \\ dockerswarm/dind:${dockerVersion} dockerd -H tcp://0.0.0.0:2375 """ sh """docker run \\ - --name ${testContainerName} --volumes-from ${dindContainerName} \\ - -e 'DOCKER_HOST=tcp://docker:2375' \\ + --name ${testContainerName} \\ + -e "DOCKER_HOST=tcp://${dindContainerName}:2375" \\ -e 'DOCKER_TEST_API_VERSION=${apiVersion}' \\ - --link=${dindContainerName}:docker \\ + --network ${testNetwork} \\ + --volumes-from ${dindContainerName} \\ ${testImage} \\ py.test -v -rxs tests/integration """ @@ -80,6 +83,7 @@ def runTests = { Map settings -> sh """ docker stop ${dindContainerName} ${testContainerName} docker rm -vf ${dindContainerName} ${testContainerName} + docker network rm ${testNetwork} """ } } |