X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fci%2Fload_images.sh;h=b1f925ed80aadf38eb69f932174d6bc346629cb2;hb=0509cf3e141b550653e642083907a584450a7fdf;hp=ec3ec460451e6cce90bc031b07aa6bf4b39ceb01;hpb=ab7cd795f6d45bf8bedbe8903cae39bd447d3c19;p=yardstick.git

diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh
index ec3ec4604..b1f925ed8 100755
--- a/tests/ci/load_images.sh
+++ b/tests/ci/load_images.sh
@@ -45,26 +45,30 @@ build_yardstick_image()
     echo "========== Build yardstick cloud image =========="
 
     if [[ "$DEPLOY_SCENARIO" == *"-lxd-"* ]]; then
-        local cmd
-        cmd="sudo $(which yardstick-img-lxd-modify) $(pwd)/tools/ubuntu-server-cloudimg-modify.sh"
+        if [ ! -f "${RAW_IMAGE}" ];then
+            local cmd
+            cmd="sudo $(which yardstick-img-lxd-modify) $(pwd)/tools/ubuntu-server-cloudimg-modify.sh"
 
-        # Build the image. Retry once if the build fails
-        $cmd || $cmd
+            # Build the image. Retry once if the build fails
+            $cmd || $cmd
 
-        if [ ! -f "${RAW_IMAGE}" ]; then
-            echo "Failed building RAW image"
-            exit 1
+            if [ ! -f "${RAW_IMAGE}" ]; then
+                echo "Failed building RAW image"
+                exit 1
+            fi
         fi
     else
-        local cmd
-        cmd="sudo $(which yardstick-img-modify) $(pwd)/tools/ubuntu-server-cloudimg-modify.sh"
+        if [ ! -f "${QCOW_IMAGE}" ];then
+            local cmd
+            cmd="sudo $(which yardstick-img-modify) $(pwd)/tools/ubuntu-server-cloudimg-modify.sh"
 
-        # Build the image. Retry once if the build fails
-        $cmd || $cmd
+            # Build the image. Retry once if the build fails
+            $cmd || $cmd
 
-        if [ ! -f "${QCOW_IMAGE}" ]; then
-            echo "Failed building QCOW image"
-            exit 1
+            if [ ! -f "${QCOW_IMAGE}" ]; then
+                echo "Failed building QCOW image"
+                exit 1
+            fi
         fi
     fi
 }
@@ -141,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"
 }
 
@@ -189,7 +187,7 @@ load_ubuntu_image()
     echo
     echo "========== Loading ubuntu cloud image =========="
 
-    local ubuntu_image_file=/home/opnfv/images/trusty-server-cloudimg-amd64-disk1.img
+    local ubuntu_image_file=/home/opnfv/images/xenial-server-cloudimg-amd64-disk1.img
 
     EXTRA_PARAMS=""
     # VPP requires guest memory to be backed by large pages
@@ -202,7 +200,7 @@ load_ubuntu_image()
         --container-format bare \
         $EXTRA_PARAMS \
         --file $ubuntu_image_file \
-        Ubuntu-14.04)
+        Ubuntu-16.04)
     echo "$output"
 
     UBUNTU_IMAGE_ID=$(echo "$output" | grep " id " | awk '{print $(NF-1)}')
@@ -245,6 +243,13 @@ main()
     QCOW_IMAGE="/tmp/workspace/yardstick/yardstick-image.img"
     RAW_IMAGE="/tmp/workspace/yardstick/yardstick-image.tar.gz"
 
+    if [ -f /home/opnfv/images/yardstick-image.img ];then
+        QCOW_IMAGE='/home/opnfv/images/yardstick-image.img'
+    fi
+    if [ -f /home/opnfv/images/yardstick-image.tar.gz ];then
+        RAW_IMAGE='/home/opnfv/images/yardstick-image.tar.gz'
+    fi
+
     build_yardstick_image
     load_yardstick_image
     if [ "${YARD_IMG_ARCH}" == "arm64" ]; then