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>

diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh
index 5df769c..dee6759 100755 (executable)
--- 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

diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk-ha_daily.yaml
index ef47b9f..201a271 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk-ha_daily.yaml
@@ -33,6 +33,11 @@ test_cases:
   file_name: opnfv_yardstick_tc014.yaml
 -
   file_name: opnfv_yardstick_tc037.yaml
+-
+  file_name: opnfv_yardstick_tc042.yaml
+  constraint:
+      installer: compass
+      pod: huawei-pod1
 -
   file_name: opnfv_yardstick_tc055.yaml
   constraint:

diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk-noha_daily.yaml
index 2def5c2..e8db0de 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk-noha_daily.yaml
@@ -33,6 +33,11 @@ test_cases:
   file_name: opnfv_yardstick_tc014.yaml
 -
   file_name: opnfv_yardstick_tc037.yaml
+-
+  file_name: opnfv_yardstick_tc042.yaml
+  constraint:
+      installer: compass
+      pod: huawei-pod1
 -
   file_name: opnfv_yardstick_tc055.yaml
   constraint: