From 63966dec02f9bbd427da2ad0ff7423ebb8826fec Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Sat, 3 Aug 2019 19:41:00 +0200
Subject: [PATCH] Jenkinsfile: inline janky steps, and move validate to
 separate stage

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit f411be2072e721c49ba2b0f0836d67b9f9785957)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 Jenkinsfile | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e12ff0b672..b0bb6cf5ca 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -49,6 +49,20 @@ pipeline {
                                 sh 'docker build --force-rm --build-arg APT_MIRROR -t docker:${GIT_COMMIT} .'
                             }
                         }
+                        stage("Validate") {
+                            steps {
+                                sh '''
+                                docker run --rm -t --privileged \
+                                  -v "$WORKSPACE/bundles:/go/src/github.com/docker/docker/bundles" \
+                                  -v "$WORKSPACE/.git:/go/src/github.com/docker/docker/.git" \
+                                  --name docker-pr$BUILD_NUMBER \
+                                  -e DOCKER_GITCOMMIT=${GIT_COMMIT} \
+                                  -e DOCKER_GRAPHDRIVER \
+                                  docker:${GIT_COMMIT} \
+                                  hack/validate/default
+                                '''
+                            }
+                        }
                         stage("Unit tests") {
                             steps {
                                 sh '''
@@ -151,7 +165,13 @@ pipeline {
                                   -e DOCKER_GITCOMMIT=${GIT_COMMIT} \
                                   -e DOCKER_GRAPHDRIVER \
                                   docker:${GIT_COMMIT} \
-                                  hack/ci/janky
+                                  hack/make.sh \
+                                    binary-daemon \
+                                    dynbinary-daemon \
+                                    test-docker-py \
+                                    test-integration-flaky \
+                                    test-integration \
+                                    cross
                                 '''
                             }
                         }