X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fci%2Fload_images.sh;h=d723823ee754cb5e0ed37fd579a983cc17ebd5f4;hb=e49c33827a359d7c80030cf44efafa65722380c4;hp=666a78b40c4ae9e88e430c6db8dad278cc37400f;hpb=061769d82b3a14d79ab1d7292718be6a95a38ccb;p=yardstick.git diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh index 666a78b40..d723823ee 100755 --- a/tests/ci/load_images.sh +++ b/tests/ci/load_images.sh @@ -66,10 +66,8 @@ 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" \ + -e YARD_IMG_ARCH=${YARD_IMG_ARCH} \ -vvv -i inventory.ini build_yardstick_image.yml if [ ! -f "${QCOW_IMAGE}" ]; then @@ -136,7 +134,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