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 <zhang.jun3g@zte.com.cn>
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>

diff --git a/jjb/qtip/helpers/cleanup-deploy.sh b/jjb/qtip/helpers/cleanup-deploy.sh
index 95babb3..9cb19a5 100644 (file)
--- 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

diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml
index e1b71f5..8dd97de 100644 (file)
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -94,10 +94,11 @@
 - builder:
     name: qtip-validate-deploy
     builders:
-        - shell:
-            !include-raw: ./helpers/validate-deploy.sh
         - shell:
             !include-raw: ./helpers/cleanup-deploy.sh
+        - shell:
+            !include-raw: ./helpers/validate-deploy.sh
+
 
 #-----------
 # parameter