Solve double container removal problem 45/38145/1
authorZhijiang Hu <hu.zhijiang@zte.com.cn>
Wed, 26 Jul 2017 11:12:01 +0000 (19:12 +0800)
committerZhijiang Hu <hu.zhijiang@zte.com.cn>
Wed, 26 Jul 2017 11:12:10 +0000 (19:12 +0800)
From [1], We got an error from docker: "No such container: daisy"
while issuing "docker rm -v -f daisy", this OK because we do
docker run --rm before this. So it is safe to add "|| true" after
"docker rm -v -f daisy".

[1] https://build.opnfv.org/ci/job/daisy-build-daily-master/500/console

Change-Id: I3d17595156f1b6181a84d9a03e2cd6ddff275eb3
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
ci/build_rpm/build_rpms.sh

index 2175bd9..9beb5b5 100755 (executable)
@@ -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"