From 58d57c76b5264804619c58702b2e33b3fe6253b3 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Tue, 6 Aug 2019 12:35:33 +0200
Subject: [PATCH] Jenkinsfile: aarch64: split into stages, add "print info"
 unit-tests

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 Jenkinsfile | 65 +++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 51 insertions(+), 14 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c8c2ffb389..e92fe70764 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -767,20 +767,53 @@ pipeline {
                         TEST_SKIP_INTEGRATION_CLI = '1'
                     }
 
-                    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 \
-                          -e TEST_SKIP_INTEGRATION_CLI \
-                          docker:${GIT_COMMIT} \
-                          hack/make.sh \
-                            binary-daemon \
-                            dynbinary \
-                            test-integration
-                        '''
+                    stages {
+                        stage("Print info") {
+                            steps {
+                                sh 'docker version'
+                                sh 'docker info'
+                                sh '''
+                                echo "check-config.sh version: ${CHECK_CONFIG_COMMIT}"
+                                curl -fsSL -o ${WORKSPACE}/check-config.sh "https://raw.githubusercontent.com/moby/moby/${CHECK_CONFIG_COMMIT}/contrib/check-config.sh" \
+                                && bash ${WORKSPACE}/check-config.sh || true
+                                '''
+                            }
+                        }
+                        stage("Build dev image") {
+                            steps {
+                                sh 'docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} -f Dockerfile .'
+                            }
+                        }
+                        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 {
+                                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 \
+                                  -e TEST_SKIP_INTEGRATION_CLI \
+                                  docker:${GIT_COMMIT} \
+                                  hack/make.sh \
+                                    binary-daemon \
+                                    dynbinary \
+                                    test-integration
+                                '''
+                            }
+                        }
                     }
                     post {
                         always {
@@ -801,6 +834,10 @@ pipeline {
 
                             archiveArtifacts artifacts: 'aarch64-bundles.tar.gz'
                         }
+                        cleanup {
+                            sh 'make clean'
+                            deleteDir()
+                        }
                     }
                 }
                 stage('win-RS1') {