Jenkinsfile: move integration step cleanup to amd64 where it was inte…

…nded to be Signed-off-by: Tibor Vass <tibor@docker.com> (cherry picked from commit f3d8b8a) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah · Sep 26, 2019 · dfadf72 · dfadf72
1 parent 183cac2
commit dfadf72
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/Jenkinsfile b/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 '''