X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fenvs%2Fpacket_forwarding.sh;h=cdfed74b1e73692c4ebd6dd15f2d2126001d0462;hb=d651cc71797f8f32b0fe40ca4ee1c21d50558fd1;hp=643957a2d3060aebd7824e3fadcde6c3fec6cde1;hpb=7fc433e94358dcf9f7702e4430db588bad5ab955;p=kvmfornfv.git diff --git a/ci/envs/packet_forwarding.sh b/ci/envs/packet_forwarding.sh old mode 100644 new mode 100755 index 643957a2d..cdfed74b1 --- a/ci/envs/packet_forwarding.sh +++ b/ci/envs/packet_forwarding.sh @@ -12,9 +12,9 @@ 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' TESTPARAM_DAILY='--test-params TRAFFICGEN_PKT_SIZES=(64,128,512,1024,1518)' -TESTCASES_SRIOV='pvp_tput' +TESTCASES_SRIOV='pvp_tput pvvp_tput' TESTPARAM_SRIOV='--test-params TRAFFICGEN_PKT_SIZES=(64,128,512,1024,1518)' #mounting shared directory for collecting ixia test results. @@ -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 @@ -148,6 +157,9 @@ function execute_vsperf() { mkdir -p ${TEST_REPORT_LOG_DIR}/${LOG_SUBDIR} [ -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