Merge pull request #371 from andrewhsu/clean

andrewhsu · web-flow · commit 214d4ba5a2f3 · 2019-09-19T17:56:39.000-07:00
[19.03] Jenkinsfile: ensure all containers are cleaned up
Upstream-commit: 23c7134bad1e877ae17efbb3a4559fc2ed82e14e
Component: engine
diff --git a/components/engine/Jenkinsfile b/components/engine/Jenkinsfile
@@ -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 '''
