diff options
| author |   Jing Lu <lvjing5@huawei.com> | 2016-11-24 02:24:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-11-24 02:24:10 +0000 |
| commit | eec370bc52caee7fe1633ae9f3ec8ac85ac50119 (patch) | |
| tree | 9d7d1cb394c8af1880b46c3b920eef78134114a5 /tests/ci/load_images.sh | |
| parent | 0e23c697e6329a57ba168cc57886b436ea87cdc4 (diff) | |
| parent | 791868bdaabb08237fadae957a19c496a1892905 (diff) | |
Merge "Upgrade yardstick VM image from Ubuntu 14.04 to 16.04"
Diffstat (limited to 'tests/ci/load_images.sh')
| -rwxr-xr-x | tests/ci/load_images.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh index 49b972777..54a145fd3 100755 --- a/tests/ci/load_images.sh +++ b/tests/ci/load_images.sh @@ -90,14 +90,14 @@ load_yardstick_image() if [[ "$DEPLOY_SCENARIO" == *"-lxd-"* ]]; then output=$(eval glance --os-image-api-version 1 image-create \ - --name yardstick-trusty-server \ + --name yardstick-image \ --is-public true --disk-format root-tar \ --container-format bare \ $EXTRA_PARAMS \ --file $RAW_IMAGE) else output=$(eval glance --os-image-api-version 1 image-create \ - --name yardstick-trusty-server \ + --name yardstick-image \ --is-public true --disk-format qcow2 \ --container-format bare \ $EXTRA_PARAMS \ @@ -203,8 +203,8 @@ create_nova_flavor() main() { - QCOW_IMAGE="/tmp/workspace/yardstick/yardstick-trusty-server.img" - RAW_IMAGE="/tmp/workspace/yardstick/yardstick-trusty-server.tar.gz" + QCOW_IMAGE="/tmp/workspace/yardstick/yardstick-image.img" + RAW_IMAGE="/tmp/workspace/yardstick/yardstick-image.tar.gz" build_yardstick_image load_yardstick_image |