add grafan config for ha test cases tc045~tc049

[yardstick.git] / tests / ci / yardstick-verify

diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify
index 0e234f5..eafadf9 100755 (executable)
--- a/tests/ci/yardstick-verify
+++ b/tests/ci/yardstick-verify
@@ -42,7 +42,7 @@ EOF
 
 DISPATCHER_TYPE=file
 DISPATCHER_FILE_NAME="/tmp/yardstick.out"
-DISPATCHER_HTTP_TARGET=
+DISPATCHER_HTTP_TARGET="http://testresults.opnfv.org/test/api/v1/results"
 DISPATCHER_INFLUXDB_TARGET=
 
 while getopts "r:i:h" OPTION; do
@@ -128,10 +128,26 @@ install_storperf()
         echo
         echo "========== Installing storperf =========="
 
-        if ! yardstick plugin install plugin/CI/storperf.yaml; then
+        if ! yardstick -d plugin install plugin/CI/storperf.yaml; then
             echo "Install storperf plugin FAILED";
             exit 1
         fi
+
+    fi
+}
+
+remove_storperf()
+{
+    # remove Storper from huawei-pod1
+    if [ "$NODE_NAME" == "huawei-pod1" ]; then
+        echo
+        echo "========== Removing storperf =========="
+
+        if ! yardstick -d plugin remove plugin/CI/storperf.yaml; then
+            echo "Remove storperf plugin FAILED";
+            exit 1
+        fi
+
     fi
 }
 
@@ -264,15 +280,17 @@ password = 0pnfv2015
 EOF
 
     local failed=0
+    local start_date
+    local stop_date
 
     if [ ${#SUITE_FILES[@]} -gt 0 ]; then
 
+        start_date=$(date '+%Y-%m-%d %H:%M:%S')
         for suite in ${SUITE_FILES[*]}; do
 
             echo "---------------------------"
             echo "Running test suite: $suite"
             echo "---------------------------"
-
             if ! yardstick task start --suite $suite; then
                  echo "test suite $suite FAILED";
 
@@ -290,21 +308,35 @@ EOF
                     echo "Test result file ${DISPATCHER_FILE_NAME} is not exist"
                 fi
             fi
-
         done
+        stop_date=$(date '+%Y-%m-%d %H:%M:%S')
+
+
 
-        local sceanrio_status="success"
+        local sceanrio_status="SUCCESS"
+
+        if [ $failed -gt 0 ]; then
+            scenario_status="FAILED"
+        fi
+        curl -i -H 'content-type: application/json' -X POST -d \
+            "{\"project_name\": \"yardstick\",
+              \"case_name\": \"scenario_status\",
+              \"pod_name\":\"${NODE_NAME}\",
+              \"installer\":\"${INSTALLER_TYPE}\",
+              \"version\":\"${YARDSTICK_BRANCH}\",
+              \"scenario\":\"${DEPLOY_SCENARIO}\",
+              \"description\": \"yardstick ci scenario status\",
+              \"start_date\":\"${start_date}\",
+              \"stop_date\":\"${stop_date}\",
+              \"details\":\"${sceanrio_status}\"}" \
+              ${DISPATCHER_HTTP_TARGET}
 
         if [ $failed -gt 0 ]; then
-            scenario_status="failed"
             echo "---------------------------"
             echo "$failed out of ${SUITE_FILES[*]} test suites FAILED"
             echo "---------------------------"
             exit 1
         fi
-        curl -i -H 'content-type: application/json' -X POST -d \
-            '{\"details\":{\"${DEPLOY_SCENARIO}\":\"${sceanrio_status}\"}}' \
-            http://${DISPATCHER_HTTP_TARGET}:3570
 
     else
 
@@ -409,6 +441,7 @@ main()
 
     install_storperf
     run_test
+    remove_storperf
 }
 
 main