From: chenjiankun <chenjiankun1@huawei.com>
Date: Wed, 7 Jun 2017 12:33:31 +0000 (+0000)
Subject: Bugfix: load_image will move image file if image already exist in /home/opnfv/images
X-Git-Tag: opnfv-5.0.RC1~459
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F67%2F35867%2F1;p=yardstick.git

Bugfix: load_image will move image file if image already exist in /home/opnfv/images

JIRA: YARDSTICK-678

Currently if yardstick-image exist in /home/opnfv/images, load_image.sh
script will not build image, but this script will remove it. We should not
remove the image file which user offer.

Change-Id: I74ff6717606ff1dd9eacde4142e62d3923394baa
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
---

diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh
index 2e22b83c2..b1f925ed8 100755
--- a/tests/ci/load_images.sh
+++ b/tests/ci/load_images.sh
@@ -145,12 +145,6 @@ load_yardstick_image()
         exit 1
     fi
 
-    if [[ "$DEPLOY_SCENARIO" == *"-lxd-"* ]]; then
-        sudo rm -f -- "${RAW_IMAGE}"
-    else
-        sudo rm -f -- "${QCOW_IMAGE}"
-    fi
-
     echo "Glance image id: $GLANCE_IMAGE_ID"
 }