diff options
| author |   JingLu5 <lvjing5@huawei.com> | 2016-09-12 08:28:56 +0800 |
|---|---|---|
| committer | JingLu5 <lvjing5@huawei.com> | 2016-09-12 08:51:43 +0800 |
| commit | f964dbb4290f2746bf4316581e1c4691f00d71d3 (patch) | |
| tree | 61fb5f94174b7069ad6c115ed51abddef3afb628 /tests/ci/yardstick-verify | |
| parent | 82366575b7924a8315d09989b5f0b6b651ffc9c8 (diff) | |
Add raw image support for lxd scenario
JIRA: YARDSTICK-325
Change the image format of cirros-0.3.3 to raw in lxd scenario
Change-Id: Ic8be737108f2979f71daca7bd631b4295cc382e7
Signed-off-by: JingLu5 <lvjing5@huawei.com>
Diffstat (limited to 'tests/ci/yardstick-verify')
| -rwxr-xr-x | tests/ci/yardstick-verify | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify index e3d81f9f7..37d0a9036 100755 --- a/tests/ci/yardstick-verify +++ b/tests/ci/yardstick-verify @@ -197,7 +197,7 @@ load_cirros_image() output=$(glance image-create \ --name cirros-0.3.3 \ - --disk-format qcow2 \ + --disk-format $DISK_FORMAT \ --container-format bare \ --file $image_file) echo "$output" @@ -270,12 +270,6 @@ load_yardstick_image() cd $YARDSTICK_REPO_DIR fi - if [ "$DEPLOY_SCENARIO" == "os-nosdn-lxd-ha" -o "$DEPLOY_SCENARIO" == "os-nosdn-lxd-noha" ]; then - DISK_FORMAT="raw" - else - DISK_FORMAT="qcow2" - fi - output=$(eval glance --os-image-api-version 1 image-create \ --name yardstick-trusty-server \ --is-public true --disk-format $DISK_FORMAT \ @@ -488,6 +482,12 @@ main() QCOW_IMAGE="/tmp/workspace/yardstick/yardstick-trusty-server.img" + if [ "$DEPLOY_SCENARIO" == "os-nosdn-lxd-ha" -o "$DEPLOY_SCENARIO" == "os-nosdn-lxd-noha" ]; then + DISK_FORMAT="raw" + else + DISK_FORMAT="qcow2" + fi + build_yardstick_image load_yardstick_image if [ $YARD_IMG_ARCH = "arm64" ]; then |