Merge pull request #39957 from tiborvass/jenkins-cleanup-all-containers

Jenkinsfile: ensure all containers are cleaned up
2019-09-18 16:59:00 -07:00 · 2019-09-18 16:59:00 -07:00 · 5feaae02fb
commit 5feaae02fb
parent ad1b781e44 f470698c2c
1 changed files with 2 additions and 0 deletions
--- a/2
+++ b/2
@ -701,6 +701,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 '''