Jenkinsfile: move integration step cleanup to amd64 where it was intended to be

Tibor Vass · thaJeztah · commit 0b2b525d7479 · 2019-09-26T18:16:49.000+02:00
Signed-off-by: Tibor Vass &lt;tibor@docker.com&gt;
(cherry picked from commit f3d8b8ae74804ba6a0386186c1c65bd1d556075a)
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
Upstream-commit: dfadf729d338b171451040fb31fd2b9c16c3ab3d
Component: engine
diff --git a/components/engine/Jenkinsfile b/components/engine/Jenkinsfile
@@ -332,7 +332,8 @@ pipeline {
                         always {
                             sh '''
                             echo "Ensuring container killed."
-                            docker rm -vf docker-pr$BUILD_NUMBER || true
+                            cids=$(docker ps -aq -f name=docker-pr${BUILD_NUMBER}-*)
+                            [ -n "$cids" ] && docker rm -vf $cids || true
                             '''
 
                             sh '''
@@ -701,8 +702,6 @@ pipeline {
                             sh '''
                             echo "Ensuring container killed."
                             docker rm -vf docker-pr$BUILD_NUMBER || true
-                            cids=$(docker ps -aq -f name=docker-pr${BUILD_NUMBER}-*)
-                            [ -n "$cids" ] && docker rm -vf $cids || true
                             '''
 
                             sh '''
