ci: Configure graphical output

Modify configuration of graphs generated from CI results.

Change-Id: Id1a30e0c61419ff131fb4f41138af2e62f822b9c
Signed-off-by: Martin Klozik <martinx.klozik@intel.com>

diff --git a/ci/build-vsperf.sh b/ci/build-vsperf.sh
index 5cc4385..d34c72f 100755 (executable)
--- a/ci/build-vsperf.sh
+++ b/ci/build-vsperf.sh
@@ -283,8 +283,10 @@ function generate_report() {
 
     # prepare final tarball with all logs...
     tar --exclude "${TEST_REPORT_TARBALL}" -czf "${TEST_REPORT_LOG_DIR}/${TEST_REPORT_TARBALL}" $(find "${TEST_REPORT_LOG_DIR}" -mindepth 1 -maxdepth 1 -type d)
-    # ...and move original log files to the archive directory
-    find "${TEST_REPORT_LOG_DIR}" -mindepth 1 -maxdepth 1 -type d -exec mv \{\} ${RESULTS_ARCHIVE} \;
+    # ...and move original log files to the archive directory...
+    find "${TEST_REPORT_LOG_DIR}" -maxdepth 2 -name "results_*" -type d -exec mv \{\} ${RESULTS_ARCHIVE} \;
+    # ...and remove the rest
+    find "${TEST_REPORT_LOG_DIR}" -mindepth 1 -maxdepth 1 -type d -exec rm -rf \{\} \;
 
     # clone opnfvdocs repository
     echo "Cloning opnfvdocs repository..."
@@ -308,7 +310,7 @@ function generate_report() {
 # generates graphs from recent test results
 function generate_and_push_graphs() {
     # create graphs from results in archive directory
-    ./ci/plot-results.sh "phy2phy_tput back2back pvp_tput pvvp_tput" ",OvsDpdkVhost," $RESULTS_ARCHIVE
+    ./ci/plot-results.sh $1 $2 $RESULTS_ARCHIVE
 
     # push graphs into artifactory
     if ls *png &> /dev/null ; then
@@ -521,7 +523,10 @@ case $1 in
 
         push_results_to_artifactory
 
-        generate_and_push_graphs
+        generate_and_push_graphs "$TESTCASES_DAILY" ",OvsDpdkVhost,"
+        generate_and_push_graphs "$TESTCASES_DAILY" ",OvsVanilla,"
+        generate_and_push_graphs "$TESTCASES_DAILY_VPP" ",VppDpdkVhost,"
+        generate_and_push_graphs "$TESTCASES_DAILY_SRIOV" ",none,"
 
         cleanup
 

diff --git a/ci/plot-results.sh b/ci/plot-results.sh
index 7885553..1beb082 100755 (executable)
--- a/ci/plot-results.sh
+++ b/ci/plot-results.sh
@@ -38,7 +38,7 @@
 
 TESTS="phy2phy_tput"    # default set of TCs to be plotted
 FILTER=",OvsDpdkVhost," # default filter to be applied on matching CSV files
-NUMBER_OF_RESULTS=5     # max number of recent results to be compared in graph
+NUMBER_OF_RESULTS=50    # max number of recent results to be compared in graph
 CSV_RESULT_COL=2        # column number with result to be plotted, e.g. 2 for rx_throughput_fps
 B2B_CSV_RESULT_COL=1    # column number with result to be plotted for back2back TCs
 CSV_PKT_SIZE_COL=12     # column number with frame/packet size