From: xudan <xudan16@huawei.com>
Date: Mon, 21 Aug 2017 06:33:56 +0000 (-0400)
Subject: Bugfix: No cirros-0.3.5-x86_64-disk.img
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=77a0ec3f5569f7dd5c53a2d837abf205828aa63d;p=releng.git

Bugfix: No cirros-0.3.5-x86_64-disk.img

JIRA: DOVETAIL-487

1. Functest cvp.0.5.0 doesn't have cirros image in its docker container.
2. Jobs need to download cirros-0.3.5-x86_64-disk.img and store it in
   $DOVETAIL_HOME/pre_config

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

diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index a078c8f59..7bbecc129 100755
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -126,6 +126,10 @@ fi
 echo "Download image ubuntu-16.04-server-cloudimg-amd64-disk1.img ..."
 wget -q -nc http://artifacts.opnfv.org/sdnvpn/ubuntu-16.04-server-cloudimg-amd64-disk1.img -P ${DOVETAIL_CONFIG}
 
+# functest needs to download this image first before running
+echo "Download image cirros-0.3.5-x86_64-disk.img ..."
+wget -q -nc http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img -P ${DOVETAIL_CONFIG}
+
 opts="--privileged=true -id"
 
 docker_volume="-v /var/run/docker.sock:/var/run/docker.sock"