0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Jenkinsfile: standardize cointainer names and fix s390x cleanup

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-08-03 20:05:12 +02:00
parent f51c139792
commit f2e09afff4
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Jenkinsfile vendored
View file

@ -66,7 +66,7 @@ pipeline {
sh '''
docker run --rm -t --privileged \
-v "$WORKSPACE/.git:/go/src/github.com/docker/docker/.git" \
--name dockerven-pr$BUILD_NUMBER \
--name docker-pr$BUILD_NUMBER \
-e DOCKER_GITCOMMIT=${GIT_COMMIT} \
-e DOCKER_GRAPHDRIVER=overlay2 \
-e TIMEOUT=120m \
@ -83,7 +83,6 @@ pipeline {
sh '''
echo 'Ensuring container killed.'
docker rm -vf docker-pr$BUILD_NUMBER || true
docker rm -vf dockerven-pr$BUILD_NUMBER || true
'''
sh '''
@ -203,7 +202,7 @@ pipeline {
docker run --rm -t --privileged \
-v "$WORKSPACE/bundles:/go/src/github.com/docker/docker/bundles" \
-e DOCKER_EXPERIMENTAL=y \
--name docker-pr-exp$BUILD_NUMBER \
--name docker-pr$BUILD_NUMBER \
-e DOCKER_GITCOMMIT=${GIT_COMMIT} \
-e DOCKER_GRAPHDRIVER=overlay2 \
docker:${GIT_COMMIT}-exp \
@ -217,7 +216,7 @@ pipeline {
always {
sh '''
echo "Ensuring container killed."
docker rm -vf docker-pr-exp$BUILD_NUMBER || true
docker rm -vf docker-pr$BUILD_NUMBER || true
'''
sh '''
@ -281,7 +280,7 @@ pipeline {
always {
sh '''
echo "Ensuring container killed."
docker rm -vf docker-pr-$BUILD_NUMBER || true
docker rm -vf docker-pr$BUILD_NUMBER || true
'''
sh '''