diff options
author | JingLu5 <lvjing5@huawei.com> | 2016-08-01 16:13:01 +0800 |
---|---|---|
committer | JingLu5 <lvjing5@huawei.com> | 2016-08-03 08:30:28 +0800 |
commit | c90a6b6209038814d0d2763dfd287e5e2f1de121 (patch) | |
tree | a93c6bc62afd5ca62ac1555dce580f267e6b4ae0 /tests/ci/yardstick-verify | |
parent | c89fda5b5e7ae1ce501fba9e506ff3528c7d6f92 (diff) |
Add Storperf in CI [work in progress]
Add task configration file for TC074_Storperf and update test suite file
Add test case description for TC074_Storperf
Update Dockerfile to add ubuntu image used by Storperf
Update yardstick-verify to load ubuntu image and install Storperf
Modify plugin.py to support local installation
Change-Id: I4de764c7924aac98de6e6a8664f9d5c0b58cf31b
Signed-off-by: JingLu5 <lvjing5@huawei.com>
Diffstat (limited to 'tests/ci/yardstick-verify')
-rwxr-xr-x | tests/ci/yardstick-verify | 42 |
1 files changed, 41 insertions, 1 deletions
diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify index c83193574..649eb31fd 100755 --- a/tests/ci/yardstick-verify +++ b/tests/ci/yardstick-verify @@ -80,7 +80,7 @@ cleanup() return fi - for image in $(glance image-list | grep -e cirros-0.3.3 -e yardstick-trusty-server | awk '{print $2}'); do + for image in $(glance image-list | grep -e cirros-0.3.3 -e yardstick-trusty-server -e Ubuntu-14.04 | awk '{print $2}'); do echo "Deleting image $image..." glance image-delete $image || true done @@ -121,6 +121,20 @@ install_yardstick() pip install . } +install_storperf() +{ + # Install Storper on huawei-pod1 + if [ "$NODE_NAME" == "huawei-pod1" ]; then + echo + echo "========== Installing storperf ==========" + + if ! yardstick plugin install plugin/CI/storperf.yaml; then + echo "Install storperf plugin FAILED"; + exit 1 + fi + fi +} + build_yardstick_image() { echo @@ -174,6 +188,30 @@ load_cirros_image() echo "Cirros image id: $CIRROS_IMAGE_ID" } +load_ubuntu_image() +{ + echo + echo "========== Loading ubuntu cloud image ==========" + + local ubuntu_image_file=/home/opnfv/images/trusty-server-cloudimg-amd64-disk1.img + + output=$(glance image-create \ + --name Ubuntu-14.04 \ + --disk-format qcow2 \ + --container-format bare \ + --file $ubuntu_image_file) + echo "$output" + + UBUNTU_IMAGE_ID=$(echo "$output" | grep " id " | awk '{print $(NF-1)}') + + if [ -z "$UBUNTU_IMAGE_ID" ]; then + echo 'Failed uploading UBUNTU image to cloud'. + exit 1 + fi + + echo "Ubuntu image id: $UBUNTU_IMAGE_ID" +} + load_yardstick_image() { echo @@ -361,8 +399,10 @@ main() build_yardstick_image load_yardstick_image load_cirros_image + load_ubuntu_image create_nova_flavor + install_storperf run_test } |