diff options
| author |   xudan <xudan16@huawei.com> | 2018-04-22 21:28:06 -0400 |
|---|---|---|
| committer | xudan <xudan16@huawei.com> | 2018-04-22 21:35:38 -0400 |
| commit | 751447bbe93e412c993efb50c7769413724e16f0 (patch) | |
| tree | ae0e59e8205cdf375d04fbb404a935afa92d7a04 | |
| parent | cf1ba3b2c19202a17fdd12a9ada8ca3a1f3f627a (diff) | |
Use cirros-0.4.0 rather than cirros-0.3.5 for Functest Fraser.
Change-Id: If3cd0fe52d946979de259951c7c8433b6e1e42f0
Signed-off-by: xudan <xudan16@huawei.com>
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 10 |
1 files changed, 9 insertions, 1 deletions
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 |