summaryrefslogtreecommitdiffstats
path: root/tests/ci
diff options
context:
space:
mode:
authorliyin <liyin11@huawei.com>2018-03-31 02:38:19 +0000
committerliyin <liyin11@huawei.com>2018-03-31 02:41:12 +0000
commitcff53001219021a0dd79f278ca3fdda0f26cf9f4 (patch)
tree4c4fe8806ac8bad7b37cde9b71c8753d36032d71 /tests/ci
parentbc9d71d2d272999fe4fc446dbcf6c81aae782a98 (diff)
ADD tc042 into CI
JIRA: YARDSTICK-1108 We add this test case in ovs_dpdk-ha and ovs_dpdk-noha testsuites also add image build into load_images script Change-Id: I2b0c6b106dd98c3693df18dba46259ff8ef0a76e Signed-off-by: liyin <liyin11@huawei.com>
Diffstat (limited to 'tests/ci')
-rwxr-xr-xtests/ci/load_images.sh21
1 files changed, 21 insertions, 0 deletions
diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh
index 5df769c0d..dee675981 100755
--- a/tests/ci/load_images.sh
+++ b/tests/ci/load_images.sh
@@ -75,6 +75,16 @@ build_yardstick_image()
exit 1
fi
fi
+ if [[ $DEPLOY_SCENARIO == *[_-]ovs[_-]* ]]; then
+ ansible-playbook \
+ -e img_property="nsb" \
+ -e YARD_IMG_ARCH=${YARD_IMG_ARCH} \
+ -vvv -i inventory.ini build_yardstick_image.yml
+ if [ ! -f "${QCOW_NSB_IMAGE}" ]; then
+ echo "Failed building QCOW NSB image"
+ exit 1
+ fi
+ fi
fi
}
@@ -112,6 +122,16 @@ load_yardstick_image()
${EXTRA_PARAMS} \
--file ${QCOW_IMAGE} \
yardstick-image)
+ if [[ $DEPLOY_SCENARIO == *[_-]ovs[_-]* ]]; then
+ nsb_output=$(eval openstack ${SECURE} image create \
+ --public \
+ --disk-format qcow2 \
+ --container-format bare \
+ ${EXTRA_PARAMS} \
+ --file ${QCOW_NSB_IMAGE} \
+ yardstick-samplevnfs)
+ echo "$nsb_output"
+ fi
fi
echo "$output"
@@ -232,6 +252,7 @@ create_nova_flavor()
main()
{
QCOW_IMAGE="/tmp/workspace/yardstick/yardstick-image.img"
+ QCOW_NSB_IMAGE="/tmp/workspace/yardstick/yardstick-nsb-image.img"
RAW_IMAGE="/tmp/workspace/yardstick/yardstick-image.tar.gz"
if [ -f /home/opnfv/images/yardstick-image.img ];then