trending: fix re-pro showing wrong data

vpp-2n-zn2-mrr, CSIT build: https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-zn2/484, vpp version: 22.06-rc0~0-g017a67665~b2179

4t2c-avf-eth-l2bdbasemaclrn-mrr                   10ge2p1x710    64B    29.6   1  -0.2
2t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr  10ge2p1x520    64B    1.14   1  -58.08
4t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr  10ge2p1x520    64B    1.98   1  -57.73
4t4c-ethip4-ip4base-mrr                           10ge2p1x553    64B    2.97   1  -79.05
1t1c-eth-l2patch-mrr                              10ge2p1x553    64B    2.98   1  -75.94
2t2c-eth-l2bdbasemaclrn-mrr                       10ge2p1x553    64B    8.27   1  -11.0
2t1c-af-xdp-ethip4-ip4scale2m-mrr                 25ge2p1xxv710  64B    6.21   1  -53.14

vpp-2n-tx2-mrr, CSIT build: https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-tx2/265, vpp version: 22.02-rc0~508-g88a9c0e02~b851

4t2c-avf-eth-l2bdbasemaclrn-mrr                   10ge2p1x710    64B    29.6   1  -0.2
2t2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr  10ge2p1x520    64B    1.14   1  -58.08
4t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-mrr  10ge2p1x520    64B    1.98   1  -57.73
4t4c-ethip4-ip4base-mrr                           10ge2p1x553    64B    2.97   1  -79.05
1t1c-eth-l2patch-mrr                              10ge2p1x553    64B    2.98   1  -75.94
2t2c-eth-l2bdbasemaclrn-mrr                       10ge2p1x553    64B    8.27   1  -11.0
2t1c-af-xdp-ethip4-ip4scale2m-mrr                 25ge2p1xxv710  64B    6.21   1  -53.14

The same data for different TB.

Signed-off-by: Viliam Luc <vluc@cisco.com>
Change-Id: Iefce9a7196bae6fde45ee1935184efab4735e6e0

diff --git a/resources/tools/presentation/generator_cpta.py b/resources/tools/presentation/generator_cpta.py
index b4ff42e..4063764 100644 (file)
--- a/resources/tools/presentation/generator_cpta.py
+++ b/resources/tools/presentation/generator_cpta.py
@@ -838,21 +838,9 @@ def _generate_all_charts(spec, input_data):
 
     # Evaluate result:
     if anomaly_classifications:
 
     # Evaluate result:
     if anomaly_classifications:

-        test_reg_lst = []
-        nic_reg_lst = []
-        frmsize_reg_lst = []
-        trend_reg_lst = []
-        number_reg_lst = []
-        ltc_reg_lst = []
-        test_prog_lst = []
-        nic_prog_lst = []
-        frmsize_prog_lst = []
-        trend_prog_lst = []
-        number_prog_lst = []
-        ltc_prog_lst = []

         result = u"PASS"
 
         result = u"PASS"
 

-        class MaxLens():
+        class MaxLens:

             """Class to store the max lengths of strings displayed in
             regressions and progressions.
             """
             """Class to store the max lengths of strings displayed in
             regressions and progressions.
             """


@@ -874,11 +862,25 @@ def _generate_all_charts(spec, input_data):
                 self.run = run
                 self.ltc = ltc
 
                 self.run = run
                 self.ltc = ltc
 

-        max_len = MaxLens(0, 0, 0, 0, 0, 0)
-

         for job_name, job_data in anomaly_classifications.items():
             data = []
         for job_name, job_data in anomaly_classifications.items():
             data = []

+            test_reg_lst = []
+            nic_reg_lst = []
+            frmsize_reg_lst = []
+            trend_reg_lst = []
+            number_reg_lst = []
+            ltc_reg_lst = []
+            test_prog_lst = []
+            nic_prog_lst = []
+            frmsize_prog_lst = []
+            trend_prog_lst = []
+            number_prog_lst = []
+            ltc_prog_lst = []
+            max_len = MaxLens(0, 0, 0, 0, 0, 0)
+
+            # tb - testbed (2n-skx, 3n-dnv, etc)

             tb = u"-".join(job_name.split(u"-")[-2:])
             tb = u"-".join(job_name.split(u"-")[-2:])

+            # data - read all txt dashboard files for tb

             for file in listdir(f"{spec.cpta[u'output-file']}"):
                 if tb in file and u"performance-trending-dashboard" in \
                         file and u"txt" in file:
             for file in listdir(f"{spec.cpta[u'output-file']}"):
                 if tb in file and u"performance-trending-dashboard" in \
                         file and u"txt" in file:


@@ -933,9 +935,6 @@ def _generate_all_charts(spec, input_data):
                                 number_prog_lst.append(number)
                                 ltc_prog_lst.append(ltc)
 
                                 number_prog_lst.append(number)
                                 ltc_prog_lst.append(ltc)
 

-                    if classification in (u"regression", u"outlier"):
-                        result = u"FAIL"
-

             text = u""
             for idx in range(len(test_reg_lst)):
                 text += (
             text = u""
             for idx in range(len(test_reg_lst)):
                 text += (