From 402c7b1b278683efe7ca3a2119319fda4838a392 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Tue, 6 Aug 2019 12:23:12 +0200
Subject: [PATCH] Jenkinsfile: aarch64: move stage inside parallel group

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

diff --git a/Jenkinsfile b/Jenkinsfile
index e8eca85c11..6e1a0b0083 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -757,6 +757,45 @@ pipeline {
                         }
                     }
                 }
+                stage('aarch64') {
+                    when {
+                        beforeAgent true
+                        expression { params.aarch64 }
+                    }
+                    agent { label 'aarch64 && packet' }
+                    steps {
+                        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 \
+                          -v "$WORKSPACE/bundles:/go/src/github.com/docker/docker/bundles" \
+                          --name docker-pr-aarch64$BUILD_NUMBER \
+                          -e DOCKER_GRAPHDRIVER=vfs \
+                          -e DOCKER_EXECDRIVER=native \
+                          -e DOCKER_GITCOMMIT=${GITCOMMIT} \
+                          docker-aarch64:$GITCOMMIT \
+                          hack/ci/arm
+                        '''
+                    }
+                    post {
+                        always {
+                            sh '''
+                            echo "Ensuring container killed."
+                            docker rm -vf docker-pr-aarch64$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 "Creating bundles.tar.gz"
+                            find bundles -name '*.log' | xargs tar -czf bundles.tar.gz
+                            '''
+                            archiveArtifacts artifacts: 'bundles.tar.gz'
+                        }
+                    }
+                }
                 stage('win-RS1') {
                     when {
                         beforeAgent true
@@ -884,44 +923,5 @@ pipeline {
                 }
             }
         }
-        stage('aarch64') {
-            when {
-                beforeAgent true
-                expression { params.aarch64 }
-            }
-            agent { label 'aarch64 && packet' }
-            steps {
-                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 \
-                  -v "$WORKSPACE/bundles:/go/src/github.com/docker/docker/bundles" \
-                  --name docker-pr-aarch64$BUILD_NUMBER \
-                  -e DOCKER_GRAPHDRIVER=vfs \
-                  -e DOCKER_EXECDRIVER=native \
-                  -e DOCKER_GITCOMMIT=${GITCOMMIT} \
-                  docker-aarch64:$GITCOMMIT \
-                  hack/ci/arm
-                '''
-            }
-            post {
-                always {
-                    sh '''
-                    echo "Ensuring container killed."
-                    docker rm -vf docker-pr-aarch64$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 "Creating bundles.tar.gz"
-                    find bundles -name '*.log' | xargs tar -czf bundles.tar.gz
-                    '''
-                    archiveArtifacts artifacts: 'bundles.tar.gz'
-                }
-            }
-        }
     }
 }