From: helenyao <yaohelan@huawei.com>
Date: Mon, 19 Dec 2016 01:17:02 +0000 (-0500)
Subject: Bug-Fix: Fix clean_image flag does not take effect
X-Git-Tag: danube.1.0~521^2~1
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d78d0e1e358d294f5af61e4e800eeac67c23e56a;p=releng.git

Bug-Fix: Fix clean_image flag does not take effect

JIRA: FUNCTEST-665

In patch https://gerrit.opnfv.org/gerrit/#/c/25775/,
it set CLEAN_DOCKER_IMAGES=false to save time.
On CI job, the cleaning step is still undertaken.

Change-Id: Iaca64d3a347dafa9c87975c756ea8bcb30ae2f93
Signed-off-by: helenyao <yaohelan@huawei.com>
---

diff --git a/jjb/functest/functest-cleanup.sh b/jjb/functest/functest-cleanup.sh
index 3c4c7f965..a1ae67d99 100755
--- a/jjb/functest/functest-cleanup.sh
+++ b/jjb/functest/functest-cleanup.sh
@@ -10,7 +10,7 @@ if [[ ! -z $(docker ps -a | grep opnfv/functest) ]]; then
 fi
 
 # Remove existing images if exist
-if [[ $CLEAN_DOCKER_IMAGES ]] && [[ ! -z $(docker images | grep opnfv/functest) ]]; then
+if [[ $CLEAN_DOCKER_IMAGES == true ]] && [[ ! -z $(docker images | grep opnfv/functest) ]]; then
     echo "Docker images to remove:"
     docker images | head -1 && docker images | grep opnfv/functest >${redirect}
     image_tags=($(docker images | grep opnfv/functest | awk '{print $2}'))