From cafb31a9cb66cd4cbd9fe28bfd0ab2b83fec1e5d Mon Sep 17 00:00:00 2001
From: Tibor Frank <tifrank@cisco.com>
Date: Wed, 31 Jul 2019 14:03:40 +0200
Subject: [PATCH] Trending: Reduce input data

Change-Id: I8dc4fb23c07b1ab9cc0ecad852cc594ec9922055
Signed-off-by: Tibor Frank <tifrank@cisco.com>
---
 resources/tools/presentation/input_data_parser.py  | 21 ++---
 .../tools/presentation/specification_CPTA.yaml     | 99 +++++++++++-----------
 2 files changed, 59 insertions(+), 61 deletions(-)

diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index e330b12221..835609178c 100644
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -1262,11 +1262,11 @@ class InputData(object):
                         file_name = self._cfg.input["file-name"]
                         full_name = join(
                             self._cfg.environment["paths"]["DIR[WORKING,DATA]"],
-                            "{job}{sep}{build}{sep}{name}".
-                                format(job=job,
-                                       sep=SEPARATOR,
-                                       build=build["build"],
-                                       name=file_name))
+                            "{job}{sep}{build}{sep}{name}".format(
+                                job=job,
+                                sep=SEPARATOR,
+                                build=build["build"],
+                                name=file_name))
                         try:
                             remove(full_name)
                             logs.append(("INFO",
@@ -1308,11 +1308,6 @@ class InputData(object):
 
                 result = self._download_and_parse_build(job, build, repeat)
 
-                job = result["job"]
-                build_nr = result["build"]["build"]
-
-                logging.info("  {job}-{build}".format(job=job,
-                                                      build=build_nr))
                 if result["data"]:
                     data = result["data"]
                     build_data = pd.Series({
@@ -1326,12 +1321,12 @@ class InputData(object):
 
                     if self._input_data.get(job, None) is None:
                         self._input_data[job] = pd.Series()
-                    self._input_data[job][str(build_nr)] = build_data
+                    self._input_data[job][str(build)] = build_data
 
                     self._cfg.set_input_file_name(
-                        job, build_nr, result["build"]["file-name"])
+                        job, build, result["build"]["file-name"])
 
-                self._cfg.set_input_state(job, build_nr, result["state"])
+                self._cfg.set_input_state(job, build, result["state"])
 
         logging.info("Done.")
 
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index 978a8224b2..f09f1b39a7 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -169,7 +169,7 @@
     # 3n-hsw
     plot-performance-trending-all-3n-hsw:
       csit-vpp-perf-mrr-daily-master:
-        start: 720
+        start: 761
         end: "lastCompletedBuild"
         skip:
 #          - 672
@@ -186,18 +186,18 @@
 #          - 690
 #          - 694
 #          - 695
-          - 726
-          - 749
-          - 750
-          - 751
-          - 752
-          - 753
-          - 754
-          - 755
-          - 756
-          - 757
-          - 758
-          - 760
+#          - 726
+#          - 749
+#          - 750
+#          - 751
+#          - 752
+#          - 753
+#          - 754
+#          - 755
+#          - 756
+#          - 757
+#          - 758
+#          - 760
           - 781
           - 782
           - 783
@@ -219,13 +219,14 @@
           - 806
           - 808 #
           - 809 #
+          - 815
       csit-dpdk-perf-mrr-weekly-master:
         start: 73
         end: "lastCompletedBuild"
 
     plot-performance-trending-vpp-3n-hsw:
       csit-vpp-perf-mrr-daily-master:
-        start: 720
+        start: 761
         end: "lastCompletedBuild"
         skip:
 #          - 672
@@ -242,18 +243,18 @@
 #          - 690
 #          - 694
 #          - 695
-          - 726
-          - 749
-          - 750
-          - 751
-          - 752
-          - 753
-          - 754
-          - 755
-          - 756
-          - 757
-          - 758
-          - 760
+#          - 726
+#          - 749
+#          - 750
+#          - 751
+#          - 752
+#          - 753
+#          - 754
+#          - 755
+#          - 756
+#          - 757
+#          - 758
+#          - 760
           - 781
           - 782
           - 783
@@ -275,6 +276,7 @@
           - 806
           - 808 #
           - 809 #
+          - 815
 
     plot-performance-trending-dpdk-3n-hsw:
       csit-dpdk-perf-mrr-weekly-master:
@@ -284,7 +286,7 @@
     # 3n-skx
     plot-performance-trending-all-3n-skx:
       csit-vpp-perf-mrr-daily-master-3n-skx:
-        start: 450
+        start: 482
         end: "lastCompletedBuild"
         skip:
 #          - 423
@@ -298,8 +300,8 @@
 #          - 440
 #          - 444
 #          - 446
-          - 480
-          - 481
+#          - 480
+#          - 481
           - 499
           - 500
           - 501
@@ -336,7 +338,7 @@
 
     plot-performance-trending-vpp-3n-skx:
       csit-vpp-perf-mrr-daily-master-3n-skx:
-        start: 450
+        start: 482
         end: "lastCompletedBuild"
         skip:
 #          - 423
@@ -350,8 +352,8 @@
 #          - 440
 #          - 444
 #          - 446
-          - 480
-          - 481
+#          - 480
+#          - 481
           - 499
           - 500
           - 501
@@ -582,7 +584,7 @@
 
     # 3n-hsw
     csit-vpp-perf-mrr-daily-master:
-      start: 720
+      start: 761
       end: "lastCompletedBuild"
       skip:
 #        - 672
@@ -599,18 +601,18 @@
 #        - 690
 #        - 694
 #        - 695
-        - 726
-        - 749
-        - 750
-        - 751
-        - 752
-        - 753
-        - 754
-        - 755
-        - 756
-        - 757
-        - 758
-        - 760
+#        - 726
+#        - 749
+#        - 750
+#        - 751
+#        - 752
+#        - 753
+#        - 754
+#        - 755
+#        - 756
+#        - 757
+#        - 758
+#        - 760
         - 781
         - 782
         - 783
@@ -632,13 +634,14 @@
         - 806
         - 808 #
         - 809 #
+        - 815
     csit-dpdk-perf-mrr-weekly-master:
       start: 73
       end: "lastCompletedBuild"
 
     # 3n-skx
     csit-vpp-perf-mrr-daily-master-3n-skx:
-      start: 450
+      start: 482
       end: "lastCompletedBuild"
       skip:
 #        - 423
@@ -652,8 +655,8 @@
 #        - 440
 #        - 444
 #        - 446
-        - 480
-        - 481
+#        - 480
+#        - 481
         - 499
         - 500
         - 501
-- 
2.16.6