diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-09-27 07:02:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-27 07:02:24 +0000 |
| commit | 50f5122ab09ab0cbca792e853232adc6b5dae168 (patch) | |
| tree | ad11379a005f0e69d278d453b52ea371bbaaa434 | |
| parent | aa2f17841fc59cc00bd90daaefc52feef034aa6e (diff) | |
| parent | 6a4ddf3ca55ddc197ad19dc885b0c169d5b7e0cd (diff) | |
Merge "qtip bugfix: failed to clean up qtip container"
| -rw-r--r-- | jjb/qtip/qtip-cleanup.sh | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/jjb/qtip/qtip-cleanup.sh b/jjb/qtip/qtip-cleanup.sh index b923aa2a8..95babb318 100644 --- a/jjb/qtip/qtip-cleanup.sh +++ b/jjb/qtip/qtip-cleanup.sh @@ -6,15 +6,12 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -echo "Cleaning up QTIP docker containers/images..." - # Remove previous running containers if exist if [[ ! -z $(docker ps -a | grep opnfv/qtip) ]]; then echo "Removing existing opnfv/qtip containers..." - running_containers=$(docker ps | grep opnfv/qtip | awk '{print $1}') - docker stop ${running_containers} - all_containers=$(docker ps -a | grep opnfv/qtip | awk '{print $1}') - docker rm ${all_containers} + # workaround: sometimes it throws an error when stopping qtip container. + # To make sure ci job unblocked, remove qtip container by force without stopping it. + docker rm -f $(docker ps -a | grep opnfv/qtip | awk '{print $1}') fi # Remove existing images if exist @@ -27,4 +24,3 @@ if [[ ! -z $(docker images | grep opnfv/qtip) ]]; then docker rmi opnfv/qtip:$tag done fi - |