X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fenvs%2Fpacket_forwarding.sh;h=1ec6365110ff751dbcffca5ba7b3821702ff2c24;hb=HEAD;hp=ec399c6ab37d1b9cefabf0aceeb788320a6364fa;hpb=59ee691ba40e67e4975e0eaf768efb6df286ed3c;p=kvmfornfv.git

diff --git a/ci/envs/packet_forwarding.sh b/ci/envs/packet_forwarding.sh
old mode 100644
new mode 100755
index ec399c6ab..1ec636511
--- a/ci/envs/packet_forwarding.sh
+++ b/ci/envs/packet_forwarding.sh
@@ -12,7 +12,7 @@ EXIT=0
 EXIT_TC_FAILED=1
 
 # DAILY - run selected TCs for defined packet sizes
-TESTCASES_DAILY='phy2phy_tput phy2phy_tput_mod_vlan pvp_tput'
+TESTCASES_DAILY='phy2phy_tput pvp_tput pvvp_tput pvpv_cont'
 TESTPARAM_DAILY='--test-params TRAFFICGEN_PKT_SIZES=(64,128,512,1024,1518)'
 TESTCASES_SRIOV='pvp_tput'
 TESTPARAM_SRIOV='--test-params TRAFFICGEN_PKT_SIZES=(64,128,512,1024,1518)'
@@ -77,6 +77,15 @@ function print_results() {
     done
 }
 
+function publish_results() {
+    test_type=$1
+    results_dir=${TEST_REPORT_LOG_DIR}/${LOG_SUBDIR}/results*
+    time_stamp=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
+    ( cd /root/workspace/scripts ; python2.7 data_publish.py $time_stamp $test_type $results_dir )
+    #cleaning the results after publishing on grafana dashboard.
+    ( cd ${TEST_REPORT_LOG_DIR}/${LOG_SUBDIR} ; rm -rf results* )
+}
+
 function execute_vsperf() {
     # figure out list of TCs and execution parameters
     case $2 in
@@ -93,6 +102,7 @@ function execute_vsperf() {
     echo -e "\nExecution of VSPERF for $1"
     DATE_SUFFIX=$(date -u +"%Y-%m-%d_%H-%M-%S")
     source "$VSPERFENV_DIR"/bin/activate
+    cd $HOME/vswitchperf
     case $1 in
         "SRIOV")
             # use SRIOV specific TCs and configuration
@@ -108,10 +118,9 @@ function execute_vsperf() {
             # figure out log file name
             LOG_SUBDIR="OvsDpdkVhost"
             LOG_FILE="${LOG_FILE_PREFIX}_${LOG_SUBDIR}_${DATE_SUFFIX}.log"
-            echo "    $VSPERF_BIN $OPNFVPOD --vswitch OvsDpdkVhost --vnf QemuDpdkVhostUser $CONF_FILE $TESTPARAM $TESTCASES > $LOG_FILE"
-            echo "daily test cases started"
-            cd $HOME/vswitchperf
             $VSPERF_BIN --list
+            echo "daily test cases started"
+            echo "    $VSPERF_BIN --vswitch OvsDpdkVhost --vnf QemuDpdkVhostUser $CONF_FILE $TESTPARAM $TESTCASES > $LOG_FILE"
             $VSPERF_BIN  --vswitch OvsDpdkVhost --vnf QemuDpdkVhostUser $CONF_FILE $TESTPARAM $TESTCASES &>> $LOG_FILE
             ;;
     esac
@@ -146,8 +155,11 @@ function execute_vsperf() {
 
     # copy logs into dedicated directory
     mkdir -p ${TEST_REPORT_LOG_DIR}/${LOG_SUBDIR}
-    [ -f "$LOG_FILE" ] && cp -a "${LOG_FILE}" "${TEST_REPORT_LOG_DIR}/${LOG_SUBDIR}" &> /dev/null
-    [ -d "$RES_DIR" ] && cp -ar "$RES_DIR" "${TEST_REPORT_LOG_DIR}/${LOG_SUBDIR}" &> /dev/null
+    [ -f "$LOG_FILE" ] && mv "${LOG_FILE}" "${TEST_REPORT_LOG_DIR}/${LOG_SUBDIR}" &> /dev/null
+    [ -d "$RES_DIR" ] && mv "$RES_DIR" "${TEST_REPORT_LOG_DIR}/${LOG_SUBDIR}" &> /dev/null
+
+    # Publish test cases results to Grafana Dashboard
+    publish_results $1
 }
 
 #Install vsperf and set up the environment
@@ -159,9 +171,9 @@ install_qemu
 # execute job based on passed parameter
 case $1 in
     "daily")
-        echo "================"
-        echo "VSPERF daily job"
-        echo "================"
+        echo "========================================================"
+        echo "KVM4NFV daily job executing packet forwarding test cases"
+        echo "========================================================"
         execute_vsperf OVS_with_DPDK_and_vHost_User $1
         execute_vsperf SRIOV $1
         exit $EXIT