From: xudan <xudan16@huawei.com>
Date: Mon, 23 Apr 2018 01:28:06 +0000 (-0400)
Subject: Use cirros-0.4.0 rather than cirros-0.3.5 for Functest Fraser.
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=751447bbe93e412c993efb50c7769413724e16f0;p=releng.git

Use cirros-0.4.0 rather than cirros-0.3.5 for Functest Fraser.

Change-Id: If3cd0fe52d946979de259951c7c8433b6e1e42f0
Signed-off-by: xudan <xudan16@huawei.com>
---

diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index d01128385..f74b10754 100755
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -213,7 +213,7 @@ if [[ ! -f ${ubuntu_image} ]]; then
 fi
 sudo cp ${ubuntu_image} ${DOVETAIL_IMAGES}
 
-# functest needs to download this image first before running
+# yardstick and bottlenecks need to download this image first before running
 cirros_image=${image_path}/cirros-0.3.5-x86_64-disk.img
 if [[ ! -f ${cirros_image} ]]; then
     echo "Download image cirros-0.3.5-x86_64-disk.img ..."
@@ -221,6 +221,14 @@ if [[ ! -f ${cirros_image} ]]; then
 fi
 sudo cp ${cirros_image} ${DOVETAIL_IMAGES}
 
+# functest needs to download this image first before running
+cirros_image=${image_path}/cirros-0.4.0-x86_64-disk.img
+if [[ ! -f ${cirros_image} ]]; then
+    echo "Download image cirros-0.4.0-x86_64-disk.img ..."
+    wget -q -nc http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img -P ${image_path}
+fi
+sudo cp ${cirros_image} ${DOVETAIL_IMAGES}
+
 # snaps_smoke test case needs to download this image first before running
 ubuntu14_image=${image_path}/ubuntu-14.04-server-cloudimg-amd64-disk1.img
 if [[ ! -f ${ubuntu14_image} ]]; then