diff options
| author |   Jing Lu <lvjing5@huawei.com> | 2017-03-28 08:48:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-28 08:48:42 +0000 |
| commit | 2eca9b5a2de0e2c02e7ba3991944f01761679d3f (patch) | |
| tree | 4d8d2b5e4a82c84900d2f7f20e6ed42fae175d12 /tests/ci | |
| parent | 355f6833772f06b7935c58d2b15f9a1f3409c28b (diff) | |
| parent | 3f70095d15afb86567f885cbfbd89183d857f671 (diff) | |
Merge "Bugfix: Error validating value 'cirros-0.3.5'"
Diffstat (limited to 'tests/ci')
| -rwxr-xr-x | tests/ci/load_images.sh | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh index 4be51fd15..ec3ec4604 100755 --- a/tests/ci/load_images.sh +++ b/tests/ci/load_images.sh @@ -152,32 +152,36 @@ load_yardstick_image() load_cirros_image() { - echo - echo "========== Loading cirros cloud image ==========" + if [[ -n $(openstack image list | grep -e Cirros-0.3.5) ]]; then + echo "Cirros-0.3.5 image already exist, skip loading cirros image" + else + echo + echo "========== Loading cirros cloud image ==========" - local image_file=/home/opnfv/images/cirros-0.3.5-x86_64-disk.img + local image_file=/home/opnfv/images/cirros-0.3.5-x86_64-disk.img - EXTRA_PARAMS="" - # VPP requires guest memory to be backed by large pages - if [[ "$DEPLOY_SCENARIO" == *"-fdio-"* ]]; then - EXTRA_PARAMS=$EXTRA_PARAMS" --property hw_mem_page_size=large" - fi + EXTRA_PARAMS="" + # VPP requires guest memory to be backed by large pages + if [[ "$DEPLOY_SCENARIO" == *"-fdio-"* ]]; then + EXTRA_PARAMS=$EXTRA_PARAMS" --property hw_mem_page_size=large" + fi - output=$(openstack image create \ - --disk-format qcow2 \ - --container-format bare \ - ${EXTRA_PARAMS} \ - --file ${image_file} \ - cirros-0.3.5) - echo "$output" + output=$(openstack image create \ + --disk-format qcow2 \ + --container-format bare \ + ${EXTRA_PARAMS} \ + --file ${image_file} \ + cirros-0.3.5) + echo "$output" - CIRROS_IMAGE_ID=$(echo "$output" | grep " id " | awk '{print $(NF-1)}') - if [ -z "$CIRROS_IMAGE_ID" ]; then - echo 'Failed uploading cirros image to cloud'. - exit 1 - fi + CIRROS_IMAGE_ID=$(echo "$output" | grep " id " | awk '{print $(NF-1)}') + if [ -z "$CIRROS_IMAGE_ID" ]; then + echo 'Failed uploading cirros image to cloud'. + exit 1 + fi - echo "Cirros image id: $CIRROS_IMAGE_ID" + echo "Cirros image id: $CIRROS_IMAGE_ID" + fi } load_ubuntu_image() |