diff options
| author |   Ace Lee <liyin11@huawei.com> | 2017-11-03 06:39:00 +0000 |
|---|---|---|
| committer | Ace Lee <liyin11@huawei.com> | 2017-11-17 02:17:29 +0000 |
| commit | 7f0f1eaf717f7016d2f9ec5328cf9a0d02104222 (patch) | |
| tree | fab051cf9b321b2c95694643d0a846791c7779dd /tests/ci | |
| parent | 8291c3d11227de42599be920605f3f884dfa755b (diff) | |
update docker version to 16.04
JIRA: YARDSTICK-690
This patch is for Yardstick Docker base image upgrade to 16.04
This patch will enable ansible build image in yardstick env prepare.
Add qemu-img convert to ansible build image.
Change-Id: I43127b6020bd20bd9f4aac4fca0df75353b24346
Signed-off-by: Ace Lee <liyin11@huawei.com>
Diffstat (limited to 'tests/ci')
| -rwxr-xr-x | tests/ci/load_images.sh | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh index e73d7e800..666a78b40 100755 --- a/tests/ci/load_images.sh +++ b/tests/ci/load_images.sh @@ -63,11 +63,14 @@ build_yardstick_image() fi else 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 + 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}" \ + -vvv -i inventory.ini build_yardstick_image.yml if [ ! -f "${QCOW_IMAGE}" ]; then echo "Failed building QCOW image" @@ -209,7 +212,7 @@ create_nova_flavor() echo echo "========== Creating yardstick-flavor ==========" # Create the nova flavor used by some sample test cases - openstack ${SECURE} flavor create --id 100 --ram 1024 --disk 3 --vcpus 1 yardstick-flavor + openstack ${SECURE} flavor create --id 100 --ram 1024 --disk 10 --vcpus 1 yardstick-flavor # DPDK-enabled OVS requires guest memory to be backed by large pages if [[ $DEPLOY_SCENARIO == *[_-]ovs[_-]* ]]; then openstack ${SECURE} flavor set --property hw:mem_page_size=large yardstick-flavor |