1. docker
  2. Commit dfadf729d338b171451040fb31fd2b9c16c3ab3d
Browse code

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

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit f3d8b8ae74804ba6a0386186c1c65bd1d556075a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Tibor Vass authored on 2019/09/25 08:40:33
Showing 1 changed files
Jenkinsfile
History View file @ dfadf72
... ... 
@@ -332,7 +332,8 @@ pipeline {
332 332 
                         always {
333 333 
                             sh '''
334 334 
                             echo "Ensuring container killed."
335 
-                            docker rm -vf docker-pr$BUILD_NUMBER || true
335 
+                            cids=$(docker ps -aq -f name=docker-pr${BUILD_NUMBER}-*)
336 
+                            [ -n "$cids" ] && docker rm -vf $cids || true
336 337 
                             '''
337 338
338 339 
                             sh '''
... ... 
@@ -701,8 +702,6 @@ pipeline {
701 701 
                             sh '''
702 702 
                             echo "Ensuring container killed."
703 703 
                             docker rm -vf docker-pr$BUILD_NUMBER || true
704 
-                            cids=$(docker ps -aq -f name=docker-pr${BUILD_NUMBER}-*)
705 
-                            [ -n "$cids" ] && docker rm -vf $cids || true
706 704 
                             '''
707 705
708 706 
                             sh '''