diff options
| author | Joffrey F <joffrey@docker.com> | 2018-03-15 14:37:02 -0700 |
|---|---|---|
| committer | Joffrey F <f.joffrey@gmail.com> | 2018-03-20 10:14:09 +0100 |
| commit | 3f3ca7ed431b18332967cf9d3f0ffce098016011 (patch) | |
| tree | 6b787c241e65cb0e92a71c706364c89dfbeabdfd /Jenkinsfile | |
| parent | ffdc0487f5d2f20066c18e29edf2931ca66385fb (diff) | |
| download | docker-py-3f3ca7ed431b18332967cf9d3f0ffce098016011.tar.gz | |
Use networks instead of legacy links for test setup
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'Jenkinsfile')
| -rw-r--r-- | Jenkinsfile | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 6d9d343..fe68419 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,12 @@ def imageNamePy2 def imageNamePy3 def images = [:] -def dockerVersions = ["17.06.2-ce", "17.12.0-ce", "18.01.0-ce"] +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-rc4" // Latest CE RC +] def buildImage = { name, buildargs, pyTag -> img = docker.image(name) @@ -59,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 """ @@ -75,6 +83,7 @@ def runTests = { Map settings -> sh """ docker stop ${dindContainerName} ${testContainerName} docker rm -vf ${dindContainerName} ${testContainerName} + docker network rm ${testNetwork} """ } } |