Browse code

Merge pull request #371 from andrewhsu/clean

[19.03] Jenkinsfile: ensure all containers are cleaned up

Andrew Hsu authored on 2019/09/20 09:56:39
Showing 1 changed files
... ...
@@ -662,6 +662,8 @@ pipeline {
662 662
                             sh '''
663 663
                             echo "Ensuring container killed."
664 664
                             docker rm -vf docker-pr$BUILD_NUMBER || true
665
+                            cids=$(docker ps -aq -f name=docker-pr${BUILD_NUMBER}-*)
666
+                            [ -n "$cids" ] && docker rm -vf $cids || true
665 667
                             '''
666 668
 
667 669
                             sh '''