Trending: Fixes in plots, data

Change-Id: I91677a0f6e1c62633977c80fc8dec8019e580d0c
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit 12d5c9afe45ed1333e6117ef3a8d036240e80acd)

3 files changed, 148 insertions, 30 deletions

diff --git a/docs/cpta/data/index.rst b/docs/cpta/data/index.rst
index 79084af696..7d0451495b 100644
--- a/docs/cpta/data/index.rst
+++ b/docs/cpta/data/index.rst
@@ -57,3 +57,8 @@ in the ASCII and CSV formats:
 
         - `ASCII format <../_static/vpp/csit-dpdk-perf-mrr-weekly-master-2n-skx-trending.txt>`_
         - `CSV format <../_static/vpp/csit-dpdk-perf-mrr-weekly-master-2n-skx-trending.csv>`_
+
+    - 2n-clx
+
+        - `ASCII format <../_static/vpp/csit-dpdk-perf-mrr-weekly-master-2n-clx-trending.txt>`_
+        - `CSV format <../_static/vpp/csit-dpdk-perf-mrr-weekly-master-2n-clx-trending.csv>`_
diff --git a/docs/cpta/trending/dpdk-3n-skx-x710.rst b/docs/cpta/trending/dpdk-3n-skx-x710.rst
index e9b3e37afd..49decfb378 100644
--- a/docs/cpta/trending/dpdk-3n-skx-x710.rst
+++ b/docs/cpta/trending/dpdk-3n-skx-x710.rst
@@ -1,5 +1,5 @@
-3n-skx-x710-64b
----------------
+3n-skx-x710
+-----------
 
 64b-testpmd-l3fwd
 `````````````````
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index d8cfa2af85..4d162a06e7 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -196,6 +196,7 @@
     # 3n-hsw
     plot-performance-trending-all-3n-hsw:
       csit-vpp-perf-mrr-daily-master:
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
 <<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
 <<<<<<< HEAD   (d3ea22 Report: Add data)
@@ -209,6 +210,9 @@
 =======
         start: 1082
 >>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
+=======
+        start: 1086
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
         end: "lastCompletedBuild"
         skip:
 <<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
@@ -256,6 +260,7 @@
 
     plot-performance-trending-vpp-3n-hsw:
       csit-vpp-perf-mrr-daily-master:
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
 <<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
 <<<<<<< HEAD   (d3ea22 Report: Add data)
@@ -269,6 +274,9 @@
 =======
         start: 1082
 >>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
+=======
+        start: 1086
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
         end: "lastCompletedBuild"
         skip:
 <<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
@@ -319,6 +327,7 @@
     # 3n-skx
     plot-performance-trending-all-3n-skx:
       csit-vpp-perf-mrr-daily-master-3n-skx:
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
 <<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
 <<<<<<< HEAD   (d3ea22 Report: Add data)
@@ -332,6 +341,9 @@
 =======
         start: 830
 >>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
+=======
+        start: 834
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
         end: "lastCompletedBuild"
         skip:
 <<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
@@ -381,7 +393,12 @@
 =======
           - 862
           - 864
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
 >>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
+=======
+          - 865
+          - 866
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
       csit-dpdk-perf-mrr-weekly-master-3n-skx:
         start: 72
         end: "lastCompletedBuild"
@@ -392,6 +409,7 @@
 
     plot-performance-trending-vpp-3n-skx:
       csit-vpp-perf-mrr-daily-master-3n-skx:
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
 <<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
 <<<<<<< HEAD   (d3ea22 Report: Add data)
@@ -405,6 +423,9 @@
 =======
         start: 830
 >>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
+=======
+        start: 834
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
         end: "lastCompletedBuild"
         skip:
 <<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
@@ -454,7 +475,12 @@
 =======
           - 862
           - 864
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
 >>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
+=======
+          - 865
+          - 866
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
 
     plot-performance-trending-dpdk-3n-skx:
       csit-dpdk-perf-mrr-weekly-master-3n-skx:
@@ -468,6 +494,7 @@
     # 2n-skx
     plot-performance-trending-all-2n-skx:
       csit-vpp-perf-mrr-daily-master-2n-skx:
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
 <<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
 <<<<<<< HEAD   (d3ea22 Report: Add data)
@@ -481,6 +508,9 @@
 =======
         start: 856
 >>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
+=======
+        start: 858
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
         end: "lastCompletedBuild"
         skip:
 <<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
@@ -520,15 +550,14 @@
           - 874
 >>>>>>> CHANGE (01597c Trending: Update graphs)
       csit-dpdk-perf-mrr-weekly-master-2n-skx:
-        start: 72
+        start: 78
         end: "lastCompletedBuild"
         skip:
-          - 76
-          - 77
           - 79
 
     plot-performance-trending-vpp-2n-skx:
       csit-vpp-perf-mrr-daily-master-2n-skx:
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
 <<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
 <<<<<<< HEAD   (d3ea22 Report: Add data)
@@ -542,6 +571,9 @@
 =======
         start: 856
 >>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
+=======
+        start: 858
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
         end: "lastCompletedBuild"
         skip:
 <<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
@@ -590,16 +622,14 @@
 
     plot-performance-trending-dpdk-2n-skx:
       csit-dpdk-perf-mrr-weekly-master-2n-skx:
-        start: 72
+        start: 78
         end: "lastCompletedBuild"
         skip:
-          - 76
-          - 77
           - 79
 
     plot-performance-trending-vpp-nfv-2n-skx:
       csit-vpp-perf-mrr-weekly-master-2n-skx:
-        start: 45
+        start: 50
         end: "lastCompletedBuild"
         skip:
           - 52
@@ -610,7 +640,7 @@
 =======
     plot-performance-trending-vpp-2n-clx:
       csit-vpp-perf-mrr-daily-master-2n-clx:
-        start: 234
+        start: 236
         end: "lastCompletedBuild"
         skip:
           - 239
@@ -621,21 +651,19 @@
 
     plot-performance-trending-dpdk-2n-clx:
       csit-dpdk-perf-mrr-weekly-master-2n-clx:
-        start: 16
+        start: 23
         end: "lastCompletedBuild"
         skip:
-          - 18
-          - 21
-          - 22
           - 24
 
 >>>>>>> CHANGE (b51708 Trending: Plots)
     # 3n-tsh
     plot-performance-trending-all-3n-tsh:
       csit-vpp-perf-mrr-daily-master-3n-tsh:
-        start: 115
+        start: 144
         end: "lastCompletedBuild"
         skip:
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
           - 105
 <<<<<<< HEAD   (d3ea22 Report: Add data)
@@ -645,6 +673,8 @@
           - 126
           - 127
           - 135
+=======
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
           - 149
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
 >>>>>>> CHANGE (b51708 Trending: Plots)
@@ -660,9 +690,10 @@
 
     plot-performance-trending-vpp-3n-tsh:
       csit-vpp-perf-mrr-daily-master-3n-tsh:
-        start: 115
+        start: 144
         end: "lastCompletedBuild"
         skip:
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
           - 105
 <<<<<<< HEAD   (d3ea22 Report: Add data)
@@ -672,6 +703,8 @@
           - 126
           - 127
           - 135
+=======
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
           - 149
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
 >>>>>>> CHANGE (b51708 Trending: Plots)
@@ -687,6 +720,7 @@
 
     plot-performance-trending-vpp-3n-dnv:
       csit-vpp-perf-mrr-daily-master-3n-dnv:
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
 <<<<<<< HEAD   (d3ea22 Report: Add data)
         start: 134
@@ -696,8 +730,12 @@
 =======
         start: 276
 >>>>>>> CHANGE (01597c Trending: Update graphs)
+=======
+        start: 329
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
         end: "lastCompletedBuild"
         skip:
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
 <<<<<<< HEAD   (d3ea22 Report: Add data)
           - 150
@@ -726,6 +764,8 @@
           - 325
           - 326
           - 327
+=======
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
           - 343
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
 >>>>>>> CHANGE (b51708 Trending: Plots)
@@ -740,10 +780,20 @@
           - 360
           - 363
           - 364
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
 >>>>>>> CHANGE (01597c Trending: Update graphs)
+=======
+          - 381
+          - 387
+          - 388
+          - 390
+          - 391
+          - 392
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
 
     plot-performance-trending-vpp-2n-dnv:
       csit-vpp-perf-mrr-daily-master-2n-dnv:
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
 <<<<<<< HEAD   (d3ea22 Report: Add data)
         start: 133
@@ -753,8 +803,12 @@
 =======
         start: 279
 >>>>>>> CHANGE (01597c Trending: Update graphs)
+=======
+        start: 335
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
         end: "lastCompletedBuild"
         skip:
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
           - 145
           - 149
           - 150
@@ -775,6 +829,8 @@
           - 330
           - 331
           - 332
+=======
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
           - 344
           - 349
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
@@ -788,7 +844,16 @@
           - 365
           - 366
           - 370
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
 >>>>>>> CHANGE (01597c Trending: Update graphs)
+=======
+          - 378
+          - 387
+          - 394
+          - 395
+          - 396
+          - 397
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
 
   plot-layouts:
 
@@ -886,6 +951,7 @@
 
     # 3n-hsw
     csit-vpp-perf-mrr-daily-master:
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
 <<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
 <<<<<<< HEAD   (d3ea22 Report: Add data)
@@ -899,6 +965,9 @@
 =======
       start: 1082
 >>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
+=======
+      start: 1086
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
       end: "lastCompletedBuild"
       skip:
 <<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
@@ -936,16 +1005,14 @@
         - 1102
 >>>>>>> CHANGE (b51708 Trending: Plots)
     csit-dpdk-perf-mrr-weekly-master:
-      start: 107
+      start: 113
       end: "lastCompletedBuild"
       skip:
-        - 110
-        - 111
-        - 112
         - 114
 
     # 3n-skx
     csit-vpp-perf-mrr-daily-master-3n-skx:
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
 <<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
 <<<<<<< HEAD   (d3ea22 Report: Add data)
@@ -959,6 +1026,9 @@
 =======
       start: 830
 >>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
+=======
+      start: 834
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
       end: "lastCompletedBuild"
       skip:
 <<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
@@ -1008,17 +1078,21 @@
 =======
         - 862
         - 864
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
 >>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
+=======
+        - 865
+        - 866
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
     csit-dpdk-perf-mrr-weekly-master-3n-skx:
-      start: 72
+      start: 78
       end: "lastCompletedBuild"
       skip:
-        - 76
-        - 77
         - 79
 
     # 2n-skx
     csit-vpp-perf-mrr-daily-master-2n-skx:
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
 <<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
 <<<<<<< HEAD   (d3ea22 Report: Add data)
@@ -1032,6 +1106,9 @@
 =======
       start: 856
 >>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
+=======
+      start: 858
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
       end: "lastCompletedBuild"
       skip:
 <<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
@@ -1071,22 +1148,20 @@
         - 874
 >>>>>>> CHANGE (01597c Trending: Update graphs)
     csit-vpp-perf-mrr-weekly-master-2n-skx:
-      start: 45
+      start: 50
       end: "lastCompletedBuild"
       skip:
         - 52
         - 54
         - 55
     csit-dpdk-perf-mrr-weekly-master-2n-skx:
-      start: 72
+      start: 78
       end: "lastCompletedBuild"
       skip:
-        - 76
-        - 77
         - 79
 
     csit-vpp-perf-mrr-daily-master-2n-clx:
-      start: 234
+      start: 236
       end: "lastCompletedBuild"
       skip:
 <<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
@@ -1120,23 +1195,27 @@
         - 253
 
     csit-dpdk-perf-mrr-weekly-master-2n-clx:
-      start: 16
+      start: 23
       end: "lastCompletedBuild"
       skip:
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
         - 18
         - 21
         - 22
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
 >>>>>>> CHANGE (b51708 Trending: Plots)
 =======
+=======
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
         - 24
 >>>>>>> CHANGE (01597c Trending: Update graphs)
 
     # 3n-tsh
     csit-vpp-perf-mrr-daily-master-3n-tsh:
-      start: 115
+      start: 144
       end: "lastCompletedBuild"
       skip:
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
         - 105
 <<<<<<< HEAD   (d3ea22 Report: Add data)
@@ -1146,6 +1225,8 @@
         - 126
         - 127
         - 135
+=======
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
         - 149
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
 >>>>>>> CHANGE (b51708 Trending: Plots)
@@ -1161,6 +1242,7 @@
 
     # 3n-dnv
     csit-vpp-perf-mrr-daily-master-3n-dnv:
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
 <<<<<<< HEAD   (d3ea22 Report: Add data)
       start: 134
@@ -1170,8 +1252,12 @@
 =======
       start: 276
 >>>>>>> CHANGE (01597c Trending: Update graphs)
+=======
+      start: 329
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
       end: "lastCompletedBuild"
       skip:
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
 <<<<<<< HEAD   (d3ea22 Report: Add data)
         - 150
@@ -1200,6 +1286,8 @@
         - 325
         - 326
         - 327
+=======
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
         - 343
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
 >>>>>>> CHANGE (b51708 Trending: Plots)
@@ -1214,10 +1302,20 @@
         - 360
         - 363
         - 364
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
 >>>>>>> CHANGE (01597c Trending: Update graphs)
+=======
+        - 381
+        - 387
+        - 388
+        - 390
+        - 391
+        - 392
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
 
     # 2n-dnv
     csit-vpp-perf-mrr-daily-master-2n-dnv:
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
 <<<<<<< HEAD   (d3ea22 Report: Add data)
       start: 133
@@ -1227,8 +1325,12 @@
 =======
       start: 279
 >>>>>>> CHANGE (01597c Trending: Update graphs)
+=======
+      start: 335
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
       end: "lastCompletedBuild"
       skip:
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
         - 145
         - 149
         - 150
@@ -1249,6 +1351,8 @@
         - 330
         - 331
         - 332
+=======
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
         - 344
         - 349
 <<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
@@ -1262,7 +1366,16 @@
         - 365
         - 366
         - 370
+<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
 >>>>>>> CHANGE (01597c Trending: Update graphs)
+=======
+        - 378
+        - 387
+        - 394
+        - 395
+        - 396
+        - 397
+>>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
 
 -
   type: "output"