From 62af652a5a9610f7639068db151aa0e166df3991 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Sat, 3 Aug 2019 19:57:50 +0200
Subject: [PATCH] Jenkinsfile: inline experimental, power, z steps, and split
 Unit test

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 1e8ede514e3c4c1033592f2e6e61a0dbbb14bf39)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 Jenkinsfile | 44 ++++++++++++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b0bb6cf5ca..39c8dcdca1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -226,7 +226,7 @@ pipeline {
                                 sh 'docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT}-exp .'
                             }
                         }
-                        stage("Run tests") {
+                        stage("Integration tests") {
                             steps {
                                 sh '''
                                 docker run --rm -t --privileged \
@@ -236,7 +236,9 @@ pipeline {
                                   -e DOCKER_GITCOMMIT=${GIT_COMMIT} \
                                   -e DOCKER_GRAPHDRIVER \
                                   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 {
                                 sh '''
                                 docker run --rm -t --privileged \
@@ -305,7 +320,9 @@ pipeline {
                                   -e DOCKER_GRAPHDRIVER \
                                   -e TIMEOUT="300m" \
                                   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 .'
                             }
                         }
-                        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 {
                                 sh '''
                                 docker run --rm -t --privileged \
@@ -372,7 +402,9 @@ pipeline {
                                   -e DOCKER_GRAPHDRIVER \
                                   -e TIMEOUT="180m" \
                                   docker:${GIT_COMMIT} \
-                                  hack/ci/powerpc
+                                  hack/make.sh \
+                                    dynbinary \
+                                    test-integration
                                 '''
                             }
                         }