GitList

Browse code

Jenkinsfile: ensure all containers are cleaned up

By convention, containers spawned by jenkins jobs have the name:
docker-pr${BUILD_NUMBER}

That works fine for jobs with a single container. This commit cleans up
when multiple containers are spawned with the convention that their names
share the same "docker-pr${BUILD_NUMBER}-" prefix.

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit f470698c2c10c2382080fab34f83088450fabdd6)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>

Tibor Vass authored on 2019/09/19 06:47:58
Showing 1 changed files

Jenkinsfile index 4cd0521..6a5137e 100644

Jenkinsfile

History View file @ 4b5c535

@@ -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 '''