Merge pull request #371 from andrewhsu/clean

[19.03] Jenkinsfile: ensure all containers are cleaned up
2019-09-19 17:56:39 -07:00 · 2019-09-19 17:56:39 -07:00 · 23c7134bad
parent 2399b7a91b 4b5c535be9
commit 23c7134bad
1 changed files with 2 additions and 0 deletions
--- a/2
+++ b/2
@ -662,6 +662,8 @@ 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 '''