1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #39606 from andrewhsu/execdriver

remove DOCKER_EXECDRIVER from Jenkinsfile
This commit is contained in:
Brian Goff 2019-07-25 12:59:28 -07:00 committed by GitHub
commit 8297dc26e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

7
Jenkinsfile vendored
View file

@ -75,7 +75,6 @@ pipeline {
--name docker-pr$BUILD_NUMBER \ --name docker-pr$BUILD_NUMBER \
-e DOCKER_GITCOMMIT=${GITCOMMIT} \ -e DOCKER_GITCOMMIT=${GITCOMMIT} \
-e DOCKER_GRAPHDRIVER=vfs \ -e DOCKER_GRAPHDRIVER=vfs \
-e DOCKER_EXECDRIVER=native \
-e GIT_SHA1=${GIT_COMMIT} \ -e GIT_SHA1=${GIT_COMMIT} \
docker:$GITCOMMIT \ docker:$GITCOMMIT \
hack/ci/janky hack/ci/janky
@ -126,7 +125,6 @@ pipeline {
--name docker-pr-exp$BUILD_NUMBER \ --name docker-pr-exp$BUILD_NUMBER \
-e DOCKER_GITCOMMIT=${GITCOMMIT} \ -e DOCKER_GITCOMMIT=${GITCOMMIT} \
-e DOCKER_GRAPHDRIVER=vfs \ -e DOCKER_GRAPHDRIVER=vfs \
-e DOCKER_EXECDRIVER=native \
docker:${GITCOMMIT}-exp \ docker:${GITCOMMIT}-exp \
hack/ci/experimental hack/ci/experimental
''' '''
@ -172,7 +170,6 @@ pipeline {
-v "$WORKSPACE/bundles:/go/src/github.com/docker/docker/bundles" \ -v "$WORKSPACE/bundles:/go/src/github.com/docker/docker/bundles" \
--name docker-pr-s390x$BUILD_NUMBER \ --name docker-pr-s390x$BUILD_NUMBER \
-e DOCKER_GRAPHDRIVER=vfs \ -e DOCKER_GRAPHDRIVER=vfs \
-e DOCKER_EXECDRIVER=native \
-e TIMEOUT="300m" \ -e TIMEOUT="300m" \
-e DOCKER_GITCOMMIT=${GITCOMMIT} \ -e DOCKER_GITCOMMIT=${GITCOMMIT} \
docker-s390x:$GITCOMMIT \ docker-s390x:$GITCOMMIT \
@ -220,7 +217,6 @@ pipeline {
-v "$WORKSPACE/bundles:/go/src/github.com/docker/docker/bundles" \ -v "$WORKSPACE/bundles:/go/src/github.com/docker/docker/bundles" \
--name docker-pr-power$BUILD_NUMBER \ --name docker-pr-power$BUILD_NUMBER \
-e DOCKER_GRAPHDRIVER=vfs \ -e DOCKER_GRAPHDRIVER=vfs \
-e DOCKER_EXECDRIVER=native \
-e DOCKER_GITCOMMIT=${GITCOMMIT} \ -e DOCKER_GITCOMMIT=${GITCOMMIT} \
-e TIMEOUT="180m" \ -e TIMEOUT="180m" \
docker-powerpc:$GITCOMMIT \ docker-powerpc:$GITCOMMIT \
@ -265,7 +261,6 @@ pipeline {
docker run --rm -t --privileged \ docker run --rm -t --privileged \
--name dockerven-pr$BUILD_NUMBER \ --name dockerven-pr$BUILD_NUMBER \
-e DOCKER_GRAPHDRIVER=vfs \ -e DOCKER_GRAPHDRIVER=vfs \
-e DOCKER_EXECDRIVER=native \
-v "$WORKSPACE/.git:/go/src/github.com/docker/docker/.git" \ -v "$WORKSPACE/.git:/go/src/github.com/docker/docker/.git" \
-e DOCKER_GITCOMMIT=${GITCOMMIT} \ -e DOCKER_GITCOMMIT=${GITCOMMIT} \
-e TIMEOUT=120m dockerven:$GITCOMMIT \ -e TIMEOUT=120m dockerven:$GITCOMMIT \
@ -319,4 +314,4 @@ pipeline {
} }
} }
} }
} }