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

Jenkinsfile: inline experimental, power, z steps, and split Unit test

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

44
Jenkinsfile vendored
View file

@ -226,7 +226,7 @@ pipeline {
sh 'docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT}-exp .' sh 'docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT}-exp .'
} }
} }
stage("Run tests") { stage("Integration tests") {
steps { steps {
sh ''' sh '''
docker run --rm -t --privileged \ docker run --rm -t --privileged \
@ -236,7 +236,9 @@ pipeline {
-e DOCKER_GITCOMMIT=${GIT_COMMIT} \ -e DOCKER_GITCOMMIT=${GIT_COMMIT} \
-e DOCKER_GRAPHDRIVER \ -e DOCKER_GRAPHDRIVER \
docker:${GIT_COMMIT}-exp \ docker:${GIT_COMMIT}-exp \
hack/ci/experimental hack/make.sh \
binary-daemon \
test-integration
''' '''
} }
} }
@ -295,7 +297,20 @@ pipeline {
''' '''
} }
} }
stage("Run tests") { stage("Unit tests") {
steps {
sh '''
docker run --rm -t --privileged \
-v "$WORKSPACE/bundles:/go/src/github.com/docker/docker/bundles" \
--name docker-pr$BUILD_NUMBER \
-e DOCKER_GITCOMMIT=${GIT_COMMIT} \
-e DOCKER_GRAPHDRIVER \
docker:${GIT_COMMIT} \
hack/test/unit
'''
}
}
stage("Integration tests") {
steps { steps {
sh ''' sh '''
docker run --rm -t --privileged \ docker run --rm -t --privileged \
@ -305,7 +320,9 @@ pipeline {
-e DOCKER_GRAPHDRIVER \ -e DOCKER_GRAPHDRIVER \
-e TIMEOUT="300m" \ -e TIMEOUT="300m" \
docker:${GIT_COMMIT} \ docker:${GIT_COMMIT} \
hack/ci/z hack/make.sh \
dynbinary \
test-integration
''' '''
} }
} }
@ -362,7 +379,20 @@ pipeline {
sh 'docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} -f Dockerfile .' sh 'docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} -f Dockerfile .'
} }
} }
stage("Run tests") { stage("Unit tests") {
steps {
sh '''
docker run --rm -t --privileged \
-v "$WORKSPACE/bundles:/go/src/github.com/docker/docker/bundles" \
--name docker-pr$BUILD_NUMBER \
-e DOCKER_GITCOMMIT=${GIT_COMMIT} \
-e DOCKER_GRAPHDRIVER \
docker:${GIT_COMMIT} \
hack/test/unit
'''
}
}
stage("Integration tests") {
steps { steps {
sh ''' sh '''
docker run --rm -t --privileged \ docker run --rm -t --privileged \
@ -372,7 +402,9 @@ pipeline {
-e DOCKER_GRAPHDRIVER \ -e DOCKER_GRAPHDRIVER \
-e TIMEOUT="180m" \ -e TIMEOUT="180m" \
docker:${GIT_COMMIT} \ docker:${GIT_COMMIT} \
hack/ci/powerpc hack/make.sh \
dynbinary \
test-integration
''' '''
} }
} }