ceph-docker-pull-requests: really try to remove containers

Signed-off-by: Alfredo Deza <adeza@redhat.com>

diff --git a/ceph-docker-pull-requests/build/build b/ceph-docker-pull-requests/build/build
index a2c615b1008638b7dc56e896ca563f321aa87c22..941f84fbe6488f64615cb6b35981f939870d1819 100644 (file)
--- a/ceph-docker-pull-requests/build/build
+++ b/ceph-docker-pull-requests/build/build
@@ -15,6 +15,10 @@ sudo rm -rf "$WORKSPACE"/ceph-docker/{daemon,demo,base}
 
 sudo apt-get install -y --force-yes xfsprogs
 sudo "$WORKSPACE"/ceph-docker/travis-builds/purge_cluster.sh
+# XXX purge_cluster only stops containers, it doesn't really remove them so try to
+# remove them for real
+sudo docker rm -f $@ $(sudo docker ps -a -q)
+
 sudo "$WORKSPACE"/ceph-docker/travis-builds/build_imgs.sh
 
 # NOTE(leseb): somehow putting everything in a 'script' task does not work