Jenkinsfile: aarch64: sync stage with other stages

Also switch aarch64 to use overlay2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-08-06 12:33:43 +02:00
parent 402c7b1b27
commit 86e0c5a0d4
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 23 additions and 16 deletions

39
Jenkinsfile vendored
View File

@ -763,36 +763,43 @@ pipeline {
expression { params.aarch64 } expression { params.aarch64 }
} }
agent { label 'aarch64 && packet' } agent { label 'aarch64 && packet' }
environment {
TEST_SKIP_INTEGRATION_CLI = '1'
}
steps { steps {
sh ''' sh '''
GITCOMMIT=$(git rev-parse --short HEAD)
docker build --rm --force-rm --build-arg APT_MIRROR=cdn-fastly.deb.debian.org -t docker-aarch64:$GITCOMMIT -f Dockerfile .
docker run --rm -t --privileged \ docker run --rm -t --privileged \
-v "$WORKSPACE/bundles:/go/src/github.com/docker/docker/bundles" \ -v "$WORKSPACE/bundles:/go/src/github.com/docker/docker/bundles" \
--name docker-pr-aarch64$BUILD_NUMBER \ --name docker-pr$BUILD_NUMBER \
-e DOCKER_GRAPHDRIVER=vfs \ -e DOCKER_GITCOMMIT=${GIT_COMMIT} \
-e DOCKER_EXECDRIVER=native \ -e DOCKER_GRAPHDRIVER \
-e DOCKER_GITCOMMIT=${GITCOMMIT} \ -e TEST_SKIP_INTEGRATION_CLI \
docker-aarch64:$GITCOMMIT \ docker:${GIT_COMMIT} \
hack/ci/arm hack/make.sh \
binary-daemon \
dynbinary \
test-integration
''' '''
} }
post { post {
always { always {
sh ''' sh '''
echo "Ensuring container killed." echo "Ensuring container killed."
docker rm -vf docker-pr-aarch64$BUILD_NUMBER || true docker rm -vf docker-pr$BUILD_NUMBER || true
echo "Chowning /workspace to jenkins user"
docker run --rm -v "$WORKSPACE:/workspace" aarch64/busybox chown -R "$(id -u):$(id -g)" /workspace
''' '''
sh '''
echo "Chowning /workspace to jenkins user"
docker run --rm -v "$WORKSPACE:/workspace" busybox chown -R "$(id -u):$(id -g)" /workspace
'''
sh ''' sh '''
echo "Creating bundles.tar.gz" echo "Creating bundles.tar.gz"
find bundles -name '*.log' | xargs tar -czf bundles.tar.gz find bundles -name '*.log' | xargs tar -czf aarch64-bundles.tar.gz
''' '''
archiveArtifacts artifacts: 'bundles.tar.gz'
archiveArtifacts artifacts: 'aarch64-bundles.tar.gz'
} }
} }
} }