Merge "cleanup: rm node_ID from yardstick prepare_env file"

[yardstick.git] / tests / ci / load_images.sh

diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh
index 666a78b..caaba9e 100755 (executable)
--- a/tests/ci/load_images.sh
+++ b/tests/ci/load_images.sh
@@ -66,10 +66,7 @@ build_yardstick_image()
             ANSIBLE_SCRIPTS="${0%/*}/../../ansible"
             cd ${ANSIBLE_SCRIPTS} &&\
             ansible-playbook \
-                     -e img_modify_playbook='ubuntu_server_cloudimg_modify.yml' \
-                     -e target_os='Ubuntu' \
-                     -e YARD_IMG_ARCH='amd64' \
-                     -e ubuntu_img_file="${QCOW_IMAGE}" \
+                     -e img_property="normal" \
                      -vvv -i inventory.ini build_yardstick_image.yml
 
             if [ ! -f "${QCOW_IMAGE}" ]; then
@@ -136,7 +133,7 @@ load_cirros_image()
         CIRROS_IMAGE_PATH="/home/opnfv/images/cirros-d161201-aarch64-disk.img"
         EXTRA_PARAMS="--property hw_video_model=vga --property short_id=ubuntu16.04"
     else
-        CIRROS_IMAGE_VERSION="Cirros-0.3.5"
+        CIRROS_IMAGE_VERSION="cirros-0.3.5"
         CIRROS_IMAGE_PATH="/home/opnfv/images/cirros-0.3.5-x86_64-disk.img"
     fi