diff options
| author |   JingLu5 <lvjing5@huawei.com> | 2016-11-04 15:21:50 +0800 |
|---|---|---|
| committer | JingLu5 <lvjing5@huawei.com> | 2016-11-09 11:54:24 +0800 |
| commit | 791868bdaabb08237fadae957a19c496a1892905 (patch) | |
| tree | 3d4403c2683903a225bd9aad04e4de931b83a671 /tests/ci | |
| parent | e80a6484956de102d14b2b42349ac1e90510cd82 (diff) | |
Upgrade yardstick VM image from Ubuntu 14.04 to 16.04
JIRA: YARDSTICK-365
This patch upgrades the base Ubuntu version of Yardstick VM image from
trusty(14.04) to xenial(16.04).
If you still want to use Ubuntu 14.04 to build Yardstick custom image you can
use command:
sudo ./tools/yardstick-img-modify tools/ubuntu-server-cloudimg-modify.sh trusty
And now the "yardstick-trusty-server" is rename as "yardstick-image".
Change-Id: I0765f3aee2d17eea1ad2257d0f576cdb9ef2b18d
Signed-off-by: JingLu5 <lvjing5@huawei.com>
Diffstat (limited to 'tests/ci')
| -rwxr-xr-x | tests/ci/clean_images.sh | 2 | ||||
| -rwxr-xr-x | tests/ci/load_images.sh | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/ci/clean_images.sh b/tests/ci/clean_images.sh index 05f68a7ed..b1942160b 100755 --- a/tests/ci/clean_images.sh +++ b/tests/ci/clean_images.sh @@ -19,7 +19,7 @@ cleanup() return fi - for image in $(glance image-list | grep -e cirros-0.3.3 -e yardstick-trusty-server -e Ubuntu-14.04 \ + for image in $(glance image-list | grep -e cirros-0.3.3 -e yardstick-image -e Ubuntu-14.04 \ -e yardstick-vivid-kernel | awk '{print $2}'); do echo "Deleting image $image..." glance image-delete $image || true 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 |