summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhijiang Hu <hu.zhijiang@zte.com.cn>2017-07-28 01:32:30 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-07-28 01:32:30 +0000
commit2be3f7850dedaa885dd4f6957b53a541045ec4ed (patch)
tree2bc922ab9fd33f0a0df31ccd019b15d84bb38bf1
parent55ab19b724474a7db45f7aa62d89097a57cb97cb (diff)
parent1556dbd17ece03633d1b03b55fd1f07b85f015ff (diff)
Merge "Solve double container removal problem"
-rwxr-xr-xci/build_rpm/build_rpms.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/build_rpm/build_rpms.sh b/ci/build_rpm/build_rpms.sh
index 2175bd97..9beb5b5d 100755
--- a/ci/build_rpm/build_rpms.sh
+++ b/ci/build_rpm/build_rpms.sh
@@ -42,7 +42,7 @@ function cleanup_container {
# Prevent "removal of container daisy is already in progress"
sleep 10
- sudo docker rm -v -f ${containers_to_kill}
+ sudo docker rm -v -f ${containers_to_kill} || true
if [[ ! -z "$volumes_to_remove" ]]; then
echo "Removing volumes... $volumes_to_remove"