Execution of Livemigration through Yardstick

[kvmfornfv.git] / ci / envs / packet_forwarding.sh

diff --git a/ci/envs/packet_forwarding.sh b/ci/envs/packet_forwarding.sh
index c93bb27..1ec6365 100755 (executable)
--- 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)'
@@ -80,8 +80,10 @@ function print_results() {
 function publish_results() {
     test_type=$1
     results_dir=${TEST_REPORT_LOG_DIR}/${LOG_SUBDIR}/results*
-    time_stamp=$(date -u +"%Y-%m-%d-%H-%M-%S")
-    ( cd /root/workspace/scripts ; python data_publish.py $time_stamp $test_type $results_dir )
+    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() {
@@ -100,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
@@ -115,7 +118,6 @@ function execute_vsperf() {
             # figure out log file name
             LOG_SUBDIR="OvsDpdkVhost"
             LOG_FILE="${LOG_FILE_PREFIX}_${LOG_SUBDIR}_${DATE_SUFFIX}.log"
-            cd $HOME/vswitchperf
             $VSPERF_BIN --list
             echo "daily test cases started"
             echo "    $VSPERF_BIN --vswitch OvsDpdkVhost --vnf QemuDpdkVhostUser $CONF_FILE $TESTPARAM $TESTCASES > $LOG_FILE"