summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJingLu5 <lvjing5@huawei.com>2016-09-02 08:28:00 +0800
committerliang gao <jean.gaoliang@huawei.com>2016-09-21 07:25:49 +0000
commit190cab217f4544c9ef3a44cd2b57f22f3e205c57 (patch)
tree15ccf6fd6753f6ec75be47e6655a18263b98e737 /tests
parent37bd09b70341e27a09dcb1cf3343b8200b923de0 (diff)
Add raw image support for lxd scenario
JIRA: YARDSTICK-325 Provide a raw format yardstick-trusty-server image when runing os-nosdn-lxd-ha or os-nosdn-lxd-noha scenarios Change-Id: I7bd1dcfe187f529134f6b30d4dd4c887f5639048 Signed-off-by: JingLu5 <lvjing5@huawei.com> (cherry picked from commit 8ce629194f3ce9e37e97456ad24bd14f3ffd7a68)
Diffstat (limited to 'tests')
-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 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)