@@ -61,33 +61,30 @@ pipeline {
6161 }
6262 }
6363 steps {
64- withCredentials([string(credentialsId : ' 52af932f-f13f-429e-8467-e7ff8b965cdb' , variable : ' CODECOV_TOKEN' )]) {
65- withGithubStatus(' janky' ) {
66- sh '''
67- # todo: include ip_vs in base image
68- sudo modprobe ip_vs
64+ withGithubStatus(' janky' ) {
65+ sh '''
66+ # todo: include ip_vs in base image
67+ sudo modprobe ip_vs
6968
70- GITCOMMIT=$(git rev-parse --short HEAD)
71- docker build --rm --force-rm --build-arg APT_MIRROR=cdn-fastly.deb.debian.org -t docker:$GITCOMMIT .
69+ GITCOMMIT=$(git rev-parse --short HEAD)
70+ docker build --rm --force-rm --build-arg APT_MIRROR=cdn-fastly.deb.debian.org -t docker:$GITCOMMIT .
7271
73- docker run --rm -t --privileged \
74- -v "$WORKSPACE/bundles:/go/src/github.com/docker/docker/bundles" \
75- -v "$WORKSPACE/.git:/go/src/github.com/docker/docker/.git" \
76- --name docker-pr$BUILD_NUMBER \
77- -e DOCKER_GITCOMMIT=${GITCOMMIT} \
78- -e DOCKER_GRAPHDRIVER=vfs \
79- -e DOCKER_EXECDRIVER=native \
80- -e CODECOV_TOKEN \
81- -e GIT_SHA1=${GIT_COMMIT} \
82- docker:$GITCOMMIT \
83- hack/ci/janky
84- '''
85- sh '''
86- GITCOMMIT=$(git rev-parse --short HEAD)
87- echo "Building e2e image"
88- docker build --build-arg DOCKER_GITCOMMIT=$GITCOMMIT -t moby-e2e-test -f Dockerfile.e2e .
89- '''
90- }
72+ docker run --rm -t --privileged \
73+ -v "$WORKSPACE/bundles:/go/src/github.com/docker/docker/bundles" \
74+ -v "$WORKSPACE/.git:/go/src/github.com/docker/docker/.git" \
75+ --name docker-pr$BUILD_NUMBER \
76+ -e DOCKER_GITCOMMIT=${GITCOMMIT} \
77+ -e DOCKER_GRAPHDRIVER=vfs \
78+ -e DOCKER_EXECDRIVER=native \
79+ -e GIT_SHA1=${GIT_COMMIT} \
80+ docker:$GITCOMMIT \
81+ hack/ci/janky
82+ '''
83+ sh '''
84+ GITCOMMIT=$(git rev-parse --short HEAD)
85+ echo "Building e2e image"
86+ docker build --build-arg DOCKER_GITCOMMIT=$GITCOMMIT -t moby-e2e-test -f Dockerfile.e2e .
87+ '''
9188 }
9289 }
9390 post {
0 commit comments