From f964dbb4290f2746bf4316581e1c4691f00d71d3 Mon Sep 17 00:00:00 2001
From: JingLu5 <lvjing5@huawei.com>
Date: Mon, 12 Sep 2016 08:28:56 +0800
Subject: 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>
---
tests/ci/yardstick-verify | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
(limited to 'tests/ci/yardstick-verify')
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
--
cgit