summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliang gao <jean.gaoliang@huawei.com>2016-09-03 00:20:47 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-03 00:20:47 +0000
commit24a89d189076f0c008fdc1115c527cf39ef8f30d (patch)
tree148cfd77cc4a4c45af7060a5dd2fcbeacf3c53a2
parentb2f67cac15f4e2cb3013d94c44fd53239efbb6ee (diff)
parent8ce629194f3ce9e37e97456ad24bd14f3ffd7a68 (diff)
Merge "Add raw image support for lxd scenario"
-rwxr-xr-xtests/ci/yardstick-verify9
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify
index 5ac0850df..8670bf4d0 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)