summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliang gao <jean.gaoliang@huawei.com>2016-09-21 07:39:34 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-21 07:39:35 +0000
commitfbf978828e41b8a94063df38f40b0b4c5af95fad (patch)
treeb4a6a5c4f374c0b00dcd9bc81207df9a34bb6b3b
parent6d0a1d61b0bdb3956439afb985c31b65b7dcf5a5 (diff)
parent190cab217f4544c9ef3a44cd2b57f22f3e205c57 (diff)
Merge "Add raw image support for lxd scenario" into stable/colorado
-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)