From 182f48bd4516f3ab0e47af6b0e702ae803e28c4f Mon Sep 17 00:00:00 2001 From: Ivan Font Date: Tue, 1 Nov 2016 20:44:36 -0700 Subject: [PATCH] Fix CI errors caused by container status commands The docker ps command was returning no containers that caused the docker rm command to fail. That, combined with the set -e flag was causing the build script to exit prematurely. Signed-off-by: Ivan Font --- ceph-docker-pull-requests/build/build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ceph-docker-pull-requests/build/build b/ceph-docker-pull-requests/build/build index c430af41f..02a2b9dec 100644 --- a/ceph-docker-pull-requests/build/build +++ b/ceph-docker-pull-requests/build/build @@ -17,7 +17,12 @@ 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) +containers_to_remove=$(sudo docker ps -a -q) + +if [ "${containers_to_remove}" ]; then + sudo docker rm -f $@ ${containers_to_remove} || echo failed to remove containers +fi + sudo "$WORKSPACE"/ceph-docker/travis-builds/build_imgs.sh -- 2.47.3