diff options
| author |   Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2017-07-26 19:12:01 +0800 |
|---|---|---|
| committer | Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2017-07-26 19:12:10 +0800 |
| commit | 1556dbd17ece03633d1b03b55fd1f07b85f015ff (patch) | |
| tree | b21c96277bcac9947593ecd245b8bd0fa4497322 /ci/build_rpm | |
| parent | 4aab5fede6d007aa7c934aabbe7294b793bc6087 (diff) | |
Solve double container removal problem
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>
Diffstat (limited to 'ci/build_rpm')
| -rwxr-xr-x | ci/build_rpm/build_rpms.sh | 2 |
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" |