diff options
| author |   liang gao <jean.gaoliang@huawei.com> | 2016-09-21 07:39:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-21 07:39:35 +0000 |
| commit | fbf978828e41b8a94063df38f40b0b4c5af95fad (patch) | |
| tree | b4a6a5c4f374c0b00dcd9bc81207df9a34bb6b3b /tests | |
| parent | 6d0a1d61b0bdb3956439afb985c31b65b7dcf5a5 (diff) | |
| parent | 190cab217f4544c9ef3a44cd2b57f22f3e205c57 (diff) | |
Merge "Add raw image support for lxd scenario" into stable/colorado
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/ci/yardstick-verify | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify index 3e9aa53cf..c5b42faa5 100755 --- a/tests/ci/yardstick-verify +++ b/tests/ci/yardstick-verify @@ -269,9 +269,16 @@ load_yardstick_image() rm -f $VIVID_KERNEL $VIVID_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 qcow2 \ + --is-public true --disk-format $DISK_FORMAT \ --container-format bare \ $EXTRA_PARAMS \ --file $QCOW_IMAGE) |