From 921094844c5a6623f5aa265b10618f2dc0ea9baf Mon Sep 17 00:00:00 2001 From: "wu.zhihui" Date: Fri, 24 Mar 2017 10:54:21 +0800 Subject: qtip: delete container and image based with branch - delete container and image based with branch - adjust builder sequence Change-Id: Id365d2358195ae690d9a4d5ae8bd1a5adfcc7046 Signed-off-by: Julien Signed-off-by: wu.zhihui --- jjb/qtip/helpers/cleanup-deploy.sh | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'jjb/qtip/helpers') diff --git a/jjb/qtip/helpers/cleanup-deploy.sh b/jjb/qtip/helpers/cleanup-deploy.sh index 95babb318..9cb19a583 100644 --- a/jjb/qtip/helpers/cleanup-deploy.sh +++ b/jjb/qtip/helpers/cleanup-deploy.sh @@ -7,20 +7,15 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## # Remove previous running containers if exist -if [[ ! -z $(docker ps -a | grep opnfv/qtip) ]]; then +if [[ ! -z $(docker ps -a | grep "opnfv/qtip:$DOCKER_TAG") ]]; then echo "Removing existing opnfv/qtip 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}') + docker rm -f $(docker ps -a | grep "opnfv/qtip:$DOCKER_TAG" | awk '{print $1}') fi # Remove existing images if exist -if [[ ! -z $(docker images | grep opnfv/qtip) ]]; then - echo "Docker images to remove:" - docker images | head -1 && docker images | grep opnfv/qtip - image_tags=($(docker images | grep opnfv/qtip | awk '{print $2}')) - for tag in "${image_tags[@]}"; do - echo "Removing docker image opnfv/qtip:$tag..." - docker rmi opnfv/qtip:$tag - done +if [[ $(docker images opnfv/qtip:${DOCKER_TAG} | wc -l) -gt 1 ]]; then + echo "Removing docker image opnfv/qtip:$DOCKER_TAG..." + docker rmi opnfv/qtip:$DOCKER_TAG fi -- cgit 1.2.3-korg