diff options
| author |   Jing Lu <lvjing5@huawei.com> | 2017-04-01 09:36:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-04-01 09:36:06 +0000 |
| commit | ce91fca5ade5ede330bf4c799dbffdf1b4762a9a (patch) | |
| tree | b5e4603270df3d7ff0e9851eaa4f7a7019de5734 /tests/ci/load_images.sh | |
| parent | 3ab4604618224ea618083e1b5cd6fd8a1d81562a (diff) | |
| parent | 38df788fc4a683717a6e7cbd498fad1e7cbe7209 (diff) | |
Merge "yardstick offline support"
Diffstat (limited to 'tests/ci/load_images.sh')
| -rwxr-xr-x | tests/ci/load_images.sh | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh index 436d18d6d..87599100b 100755 --- a/tests/ci/load_images.sh +++ b/tests/ci/load_images.sh @@ -45,26 +45,30 @@ build_yardstick_image() echo "========== Build yardstick cloud image ==========" if [[ "$DEPLOY_SCENARIO" == *"-lxd-"* ]]; then - local cmd - cmd="sudo $(which yardstick-img-lxd-modify) $(pwd)/tools/ubuntu-server-cloudimg-modify.sh" + if [ ! -f "${RAW_IMAGE}" ];then + local cmd + cmd="sudo $(which yardstick-img-lxd-modify) $(pwd)/tools/ubuntu-server-cloudimg-modify.sh" - # Build the image. Retry once if the build fails - $cmd || $cmd + # Build the image. Retry once if the build fails + $cmd || $cmd - if [ ! -f "${RAW_IMAGE}" ]; then - echo "Failed building RAW image" - exit 1 + if [ ! -f "${RAW_IMAGE}" ]; then + echo "Failed building RAW image" + exit 1 + fi fi else - local cmd - cmd="sudo $(which yardstick-img-modify) $(pwd)/tools/ubuntu-server-cloudimg-modify.sh" + if [ ! -f "${QCOW_IMAGE}" ];then + local cmd + cmd="sudo $(which yardstick-img-modify) $(pwd)/tools/ubuntu-server-cloudimg-modify.sh" - # Build the image. Retry once if the build fails - $cmd || $cmd + # Build the image. Retry once if the build fails + $cmd || $cmd - if [ ! -f "${QCOW_IMAGE}" ]; then - echo "Failed building QCOW image" - exit 1 + if [ ! -f "${QCOW_IMAGE}" ]; then + echo "Failed building QCOW image" + exit 1 + fi fi fi } @@ -245,6 +249,13 @@ main() QCOW_IMAGE="/tmp/workspace/yardstick/yardstick-image.img" RAW_IMAGE="/tmp/workspace/yardstick/yardstick-image.tar.gz" + if [ -f /home/opnfv/images/yardstick-image.img ];then + QCOW_IMAGE='/home/opnfv/images/yardstick-image.img' + fi + if [ -f /home/opnfv/images/yardstick-image.tar.gz ];then + RAW_IMAGE='/home/opnfv/images/yardstick-image.tar.gz' + fi + build_yardstick_image load_yardstick_image if [ "${YARD_IMG_ARCH}" == "arm64" ]; then |