@@ -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'

-                }

-            }

-        }

     }

 }