Code Review / csit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Trending: NDRPDR dashboard
[csit.git] / resources / tools / presentation / specification_CPTA.yaml
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index 72eab82..5eb45e6 100644 (file)
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -198,206 +198,123 @@
       csit-vpp-perf-mrr-daily-master:
         start: 1086
         end: "lastCompletedBuild"
-        skip:
-          - 1102
       csit-dpdk-perf-mrr-weekly-master:
         start: 107
         end: "lastCompletedBuild"
-        skip:
-          - 110
-          - 111
-          - 112
-          - 114
 
     plot-performance-trending-vpp-3n-hsw:
       csit-vpp-perf-mrr-daily-master:
         start: 1086
         end: "lastCompletedBuild"
-        skip:
-          - 1102
 
     plot-performance-trending-dpdk-3n-hsw:
       csit-dpdk-perf-mrr-weekly-master:
         start: 107
         end: "lastCompletedBuild"
-        skip:
-          - 110
-          - 111
-          - 112
-          - 114
 
     # 3n-skx
     plot-performance-trending-all-3n-skx:
       csit-vpp-perf-mrr-daily-master-3n-skx:
         start: 834
         end: "lastCompletedBuild"
-        skip:
-          - 849
-          - 851
-          - 862
-          - 864
-          - 865
-          - 866
       csit-dpdk-perf-mrr-weekly-master-3n-skx:
         start: 72
         end: "lastCompletedBuild"
-        skip:
-          - 76
-          - 77
-          - 79
 
     plot-performance-trending-vpp-3n-skx:
       csit-vpp-perf-mrr-daily-master-3n-skx:
         start: 834
         end: "lastCompletedBuild"
-        skip:
-          - 849
-          - 851
-          - 862
-          - 864
-          - 865
-          - 866
 
     plot-performance-trending-dpdk-3n-skx:
       csit-dpdk-perf-mrr-weekly-master-3n-skx:
         start: 72
         end: "lastCompletedBuild"
-        skip:
-          - 76
-          - 77
-          - 79
 
     # 2n-skx
     plot-performance-trending-all-2n-skx:
       csit-vpp-perf-mrr-daily-master-2n-skx:
         start: 858
         end: "lastCompletedBuild"
-        skip:
-          - 868
-          - 870
-          - 874
       csit-dpdk-perf-mrr-weekly-master-2n-skx:
         start: 78
         end: "lastCompletedBuild"
-        skip:
-          - 79
 
     plot-performance-trending-vpp-2n-skx:
       csit-vpp-perf-mrr-daily-master-2n-skx:
         start: 858
         end: "lastCompletedBuild"
-        skip:
-          - 868
-          - 870
-          - 874
 
     plot-performance-trending-dpdk-2n-skx:
       csit-dpdk-perf-mrr-weekly-master-2n-skx:
         start: 78
         end: "lastCompletedBuild"
-        skip:
-          - 79
 
     plot-performance-trending-vpp-nfv-2n-skx:
       csit-vpp-perf-mrr-weekly-master-2n-skx:
         start: 50
         end: "lastCompletedBuild"
-        skip:
-          - 52
-          - 54
-          - 55
 
     plot-performance-trending-vpp-2n-clx:
       csit-vpp-perf-mrr-daily-master-2n-clx:
         start: 236
         end: "lastCompletedBuild"
-        skip:
-          - 239
-          - 248
-          - 251
-          - 252
-          - 253
 
     plot-performance-trending-dpdk-2n-clx:
       csit-dpdk-perf-mrr-weekly-master-2n-clx:
         start: 23
         end: "lastCompletedBuild"
-        skip:
-          - 24
 
     # 3n-tsh
     plot-performance-trending-all-3n-tsh:
       csit-vpp-perf-mrr-daily-master-3n-tsh:
         start: 144
         end: "lastCompletedBuild"
-        skip:
-          - 149
-          - 150
-          - 152
-          - 153
-          - 154
-          - 155
-          - 156
-          - 157
 
     plot-performance-trending-vpp-3n-tsh:
       csit-vpp-perf-mrr-daily-master-3n-tsh:
         start: 144
         end: "lastCompletedBuild"
-        skip:
-          - 149
-          - 150
-          - 152
-          - 153
-          - 154
-          - 155
-          - 156
-          - 157
 
     plot-performance-trending-vpp-3n-dnv:
       csit-vpp-perf-mrr-daily-master-3n-dnv:
         start: 329
         end: "lastCompletedBuild"
-        skip:
-          - 343
-          - 344
-          - 345
-          - 348
-          - 350
-          - 356
-          - 357
-          - 358
-          - 360
-          - 363
-          - 364
-          - 381
-          - 387
-          - 388
-          - 390
-          - 391
-          - 392
 
     plot-performance-trending-vpp-2n-dnv:
       csit-vpp-perf-mrr-daily-master-2n-dnv:
         start: 335
         end: "lastCompletedBuild"
+
+    table-ndrpdr-comparison-2n-skx:
+      csit-vpp-perf-ndrpdr-weekly-master-2n-skx:
+        start: 76
+        end: "lastCompletedBuild"
+        max-builds: 15
+        reverse: True  # Must be reversed
+
+    table-ndrpdr-comparison-3n-skx:
+      csit-vpp-perf-ndrpdr-weekly-master-3n-skx:
+        start: 76
+        end: "lastCompletedBuild"
+        max-builds: 15
+        reverse: True  # Must be reversed
         skip:
-          - 344
-          - 349
-          - 350
-          - 351
-          - 354
-          - 360
-          - 364
-          - 365
-          - 366
-          - 370
-          - 378
-          - 387
-          - 394
-          - 395
-          - 396
-          - 397
+          - 87
+
+    table-ndrpdr-comparison-2n-clx:
+      csit-vpp-perf-ndrpdr-weekly-master-2n-clx:
+        start: 21
+        end: "lastCompletedBuild"
+        max-builds: 15
+        reverse: True  # Must be reversed
+
+    table-ndrpdr-comparison-3n-hsw:
+      csit-vpp-perf-ndrpdr-weekly-master-3n-hsw:
+        start: 76
+        end: "lastCompletedBuild"
+        max-builds: 15
+        reverse: True  # Must be reversed
 
   plot-layouts:
 
@@ -493,15 +410,44 @@
 
   builds:
 
+    # 2n-skx ndrpdr
+    csit-vpp-perf-ndrpdr-weekly-master-2n-skx:
+      start: 76
+      end: "lastCompletedBuild"
+      max-builds: 15
+
+    # 3n-skx ndrpdr
+    csit-vpp-perf-ndrpdr-weekly-master-3n-skx:
+      start: 76
+      end: "lastCompletedBuild"
+      max-builds: 15
+      skip:
+        - 87
+
+    # 2n-clx ndrpdr
+    csit-vpp-perf-ndrpdr-weekly-master-2n-clx:
+      start: 21
+      end: "lastCompletedBuild"
+      max-builds: 15
+
+    # 3n-hsw ndrpdr
+    csit-vpp-perf-ndrpdr-weekly-master-3n-hsw:
+      start: 76
+      end: "lastCompletedBuild"
+      max-builds: 15
+
     # 3n-hsw
     csit-vpp-perf-mrr-daily-master:
       start: 1086
       end: "lastCompletedBuild"
+      max-builds: 180  # Max nr of builds to download
       skip:
         - 1102
+        - 1159
     csit-dpdk-perf-mrr-weekly-master:
       start: 113
       end: "lastCompletedBuild"
+      max-builds: 15  # Max nr of builds to download
       skip:
         - 114
 
@@ -509,6 +455,7 @@
     csit-vpp-perf-mrr-daily-master-3n-skx:
       start: 834
       end: "lastCompletedBuild"
+      max-builds: 180  # Max nr of builds to download
       skip:
         - 849
         - 851
@@ -516,9 +463,11 @@
         - 864
         - 865
         - 866
+        - 867
     csit-dpdk-perf-mrr-weekly-master-3n-skx:
       start: 78
       end: "lastCompletedBuild"
+      max-builds: 15  # Max nr of builds to download
       skip:
         - 79
 
@@ -526,13 +475,16 @@
     csit-vpp-perf-mrr-daily-master-2n-skx:
       start: 858
       end: "lastCompletedBuild"
+      max-builds: 180  # Max nr of builds to download
       skip:
         - 868
         - 870
         - 874
+        - 889
     csit-vpp-perf-mrr-weekly-master-2n-skx:
       start: 50
       end: "lastCompletedBuild"
+      max-builds: 15  # Max nr of builds to download
       skip:
         - 52
         - 54
@@ -540,22 +492,26 @@
     csit-dpdk-perf-mrr-weekly-master-2n-skx:
       start: 78
       end: "lastCompletedBuild"
+      max-builds: 15  # Max nr of builds to download
       skip:
         - 79
 
     csit-vpp-perf-mrr-daily-master-2n-clx:
       start: 236
       end: "lastCompletedBuild"
+      max-builds: 180  # Max nr of builds to download
       skip:
         - 239
         - 248
         - 251
         - 252
         - 253
+        - 308
 
     csit-dpdk-perf-mrr-weekly-master-2n-clx:
       start: 23
       end: "lastCompletedBuild"
+      max-builds: 15  # Max nr of builds to download
       skip:
         - 24
 
@@ -563,6 +519,7 @@
     csit-vpp-perf-mrr-daily-master-3n-tsh:
       start: 144
       end: "lastCompletedBuild"
+      max-builds: 180  # Max nr of builds to download
       skip:
         - 149
         - 150
@@ -572,11 +529,13 @@
         - 155
         - 156
         - 157
+        - 192
 
     # 3n-dnv
     csit-vpp-perf-mrr-daily-master-3n-dnv:
       start: 329
       end: "lastCompletedBuild"
+      max-builds: 180  # Max nr of builds to download
       skip:
         - 343
         - 344
@@ -595,18 +554,20 @@
         - 390
         - 391
         - 392
+        - 396
 
     # 2n-dnv
     csit-vpp-perf-mrr-daily-master-2n-dnv:
       start: 335
       end: "lastCompletedBuild"
+      max-builds: 180  # Max nr of builds to download
       skip:
         - 344
         - 349
         - 350
         - 351
         - 354
-        - 360
+        - 36
         - 364
         - 365
         - 366
@@ -617,6 +578,7 @@
         - 395
         - 396
         - 397
+        - 402
 
 -
   type: "output"
@@ -631,6 +593,126 @@
 
 ################################################################################
 
+# VPP NDRPDR weekly comparison 2n-skx-xxv710 2t1c ndr
+- type: "table"
+  title: "VPP NDRPDR weekly comparison 2n-skx-xxv710 2t1c ndr"
+  algorithm: "table_weekly_comparison"
+  output-file: "{DIR[STATIC,VPP]}/ndrpdr-weekly-comp-2n-skx-2t1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  data: "table-ndrpdr-comparison-2n-skx"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  nr-of-data-columns: 3
+  comparisons:
+    - reference: -3
+      compare: -1
+    - reference: -2
+      compare: -1
+
+# VPP NDRPDR weekly comparison 2n-skx-xxv710 2t1c pdr
+- type: "table"
+  title: "VPP NDRPDR weekly comparison 2n-skx-xxv710 2t1c pdr"
+  algorithm: "table_weekly_comparison"
+  output-file: "{DIR[STATIC,VPP]}/ndrpdr-weekly-comp-2n-skx-2t1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  data: "table-ndrpdr-comparison-2n-skx"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  nr-of-data-columns: 3
+  comparisons:
+    - reference: -3
+      compare: -1
+    - reference: -2
+      compare: -1
+
+# VPP NDRPDR weekly comparison 3n-skx-xxv710 2t1c ndr
+- type: "table"
+  title: "VPP NDRPDR weekly comparison 3n-skx-xxv710 2t1c ndr"
+  algorithm: "table_weekly_comparison"
+  output-file: "{DIR[STATIC,VPP]}/ndrpdr-weekly-comp-3n-skx-2t1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  data: "table-ndrpdr-comparison-3n-skx"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  nr-of-data-columns: 3
+  comparisons:
+    - reference: -3
+      compare: -1
+    - reference: -2
+      compare: -1
+
+# VPP NDRPDR weekly comparison 3n-skx-xxv710 2t1c pdr
+- type: "table"
+  title: "VPP NDRPDR weekly comparison 3n-skx-xxv710 2t1c pdr"
+  algorithm: "table_weekly_comparison"
+  output-file: "{DIR[STATIC,VPP]}/ndrpdr-weekly-comp-3n-skx-2t1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  data: "table-ndrpdr-comparison-3n-skx"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  nr-of-data-columns: 3
+  comparisons:
+    - reference: -3
+      compare: -1
+    - reference: -2
+      compare: -1
+
+# VPP NDRPDR weekly comparison 2n-clx-xxv710 2t1c ndr
+- type: "table"
+  title: "VPP NDRPDR weekly comparison 2n-clx-xxv710 2t1c ndr"
+  algorithm: "table_weekly_comparison"
+  output-file: "{DIR[STATIC,VPP]}/ndrpdr-weekly-comp-2n-clx-2t1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  data: "table-ndrpdr-comparison-2n-clx"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  nr-of-data-columns: 3
+  comparisons:
+    - reference: -3
+      compare: -1
+    - reference: -2
+      compare: -1
+
+# VPP NDRPDR weekly comparison 2n-clx-xxv710 2t1c pdr
+- type: "table"
+  title: "VPP NDRPDR weekly comparison 2n-clx-xxv710 2t1c pdr"
+  algorithm: "table_weekly_comparison"
+  output-file: "{DIR[STATIC,VPP]}/ndrpdr-weekly-comp-2n-clx-2t1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  data: "table-ndrpdr-comparison-2n-clx"
+  filter: "'2T1C' and 'NDRPDR' and 'NIC_Intel-XXV710' and not 'NF_DENSITY'"
+  nr-of-data-columns: 3
+  comparisons:
+    - reference: -3
+      compare: -1
+    - reference: -2
+      compare: -1
+
+# VPP NDRPDR weekly comparison 3n-hsw-xl710 2t1c ndr
+- type: "table"
+  title: "VPP NDRPDR weekly comparison 3n-hsw-xl710 1t1c ndr"
+  algorithm: "table_weekly_comparison"
+  output-file: "{DIR[STATIC,VPP]}/ndrpdr-weekly-comp-3n-hsw-1t1c-ndr"
+  include-tests: "NDR" # "PDR" | "NDR" | "MRR"
+  data: "table-ndrpdr-comparison-3n-hsw"
+  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
+  nr-of-data-columns: 3
+  comparisons:
+    - reference: -3
+      compare: -1
+    - reference: -2
+      compare: -1
+
+# VPP NDRPDR weekly comparison 3n-hsw-xl710 2t1c pdr
+- type: "table"
+  title: "VPP NDRPDR weekly comparison 3n-hsw-xl710 1t1c pdr"
+  algorithm: "table_weekly_comparison"
+  output-file: "{DIR[STATIC,VPP]}/ndrpdr-weekly-comp-3n-hsw-1t1c-pdr"
+  include-tests: "PDR" # "PDR" | "NDR" | "MRR"
+  data: "table-ndrpdr-comparison-3n-hsw"
+  filter: "'1T1C' and 'NDRPDR' and 'NIC_Intel-XL710' and not 'NF_DENSITY'"
+  nr-of-data-columns: 3
+  comparisons:
+    - reference: -3
+      compare: -1
+    - reference: -2
+      compare: -1
+
 # Compressed failed tests (last build)
 -
   type: "table"
@@ -736,10 +818,6 @@
   - "name"
   - "parent"
   - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-1t1c-eth-l2bdscale1mmaclrn-ndrdisc"
   window: 14
   long-trend-window: 180
 
@@ -755,10 +833,6 @@
   - "name"
   - "parent"
   - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc05-64b-2t2c-eth-l2bdscale1mmaclrn-ndrdisc"
   window: 14
   long-trend-window: 180
 
@@ -774,10 +848,6 @@
   - "name"
   - "parent"
   - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc09-64b-4t4c-eth-l2bdscale1mmaclrn-ndrdisc"
   window: 14
   long-trend-window: 180
 
@@ -805,6 +875,210 @@
   output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-4t4c-3n-hsw.rst"
   testbed: "3n-hsw"
 
+# 3n-hsw
+-
+  type: "table"
+  title: "Performance trending dashboard 1t1c-3n-hsw ndr"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-hsw-ndr"
+  data: "table-ndrpdr-comparison-3n-hsw"
+  filter: "'NDRPDR' and '1T1C'"
+  include-tests: "NDR"
+  parameters:
+    - "name"
+    - "parent"
+    - "throughput"
+  window: 4
+  long-trend-window: 12
+
+-
+  type: "table"
+  title: "Performance trending dashboard 1t1c-3n-hsw pdr"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-hsw-pdr"
+  data: "table-ndrpdr-comparison-3n-hsw"
+  filter: "'NDRPDR' and '1T1C'"
+  include-tests: "PDR"
+  parameters:
+    - "name"
+    - "parent"
+    - "throughput"
+  window: 4
+  long-trend-window: 12
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 1t1c-3n-hsw ndr"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-hsw-ndr.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-hsw-ndr.rst"
+  testbed: "3n-hsw"
+  add-links: False
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 1t1c-3n-hsw pdr"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-hsw-pdr.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-1t1c-3n-hsw-pdr.rst"
+  testbed: "3n-hsw"
+  add-links: False
+
+# 3n-skx
+-
+  type: "table"
+  title: "Performance trending dashboard 2t1c-3n-skx ndr"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-3n-skx-ndr"
+  data: "table-ndrpdr-comparison-3n-skx"
+  filter: "'NDRPDR' and '2T1C'"
+  include-tests: "NDR"
+  parameters:
+    - "name"
+    - "parent"
+    - "throughput"
+  window: 4
+  long-trend-window: 12
+
+-
+  type: "table"
+  title: "Performance trending dashboard 2t1c-3n-skx pdr"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-3n-skx-pdr"
+  data: "table-ndrpdr-comparison-3n-skx"
+  filter: "'NDRPDR' and '2T1C'"
+  include-tests: "PDR"
+  parameters:
+    - "name"
+    - "parent"
+    - "throughput"
+  window: 4
+  long-trend-window: 12
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 2t1c-3n-skx ndr"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-3n-skx-ndr.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-3n-skx-ndr.rst"
+  testbed: "3n-skx"
+  add-links: False
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 2t1c-3n-skx pdr"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-3n-skx-pdr.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-3n-skx-pdr.rst"
+  testbed: "3n-skx"
+  add-links: False
+
+# 2n-skx
+-
+  type: "table"
+  title: "Performance trending dashboard 2t1c-2n-skx ndr"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-skx-ndr"
+  data: "table-ndrpdr-comparison-2n-skx"
+  filter: "'NDRPDR' and '2T1C'"
+  include-tests: "NDR"
+  parameters:
+    - "name"
+    - "parent"
+    - "throughput"
+  window: 4
+  long-trend-window: 12
+
+-
+  type: "table"
+  title: "Performance trending dashboard 2t1c-2n-skx pdr"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-skx-pdr"
+  data: "table-ndrpdr-comparison-2n-skx"
+  filter: "'NDRPDR' and '2T1C'"
+  include-tests: "PDR"
+  parameters:
+    - "name"
+    - "parent"
+    - "throughput"
+  window: 4
+  long-trend-window: 12
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 2t1c-2n-skx ndr"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-skx-ndr.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-skx-ndr.rst"
+  testbed: "2n-skx"
+  add-links: False
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 2t1c-2n-skx pdr"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-skx-pdr.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-skx-pdr.rst"
+  testbed: "2n-skx"
+  add-links: False
+
+# 2n-clx
+-
+  type: "table"
+  title: "Performance trending dashboard 2t1c-2n-clx ndr"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-clx-ndr"
+  data: "table-ndrpdr-comparison-2n-clx"
+  filter: "'NDRPDR' and '2T1C'"
+  include-tests: "NDR"
+  parameters:
+    - "name"
+    - "parent"
+    - "throughput"
+  window: 14
+  long-trend-window: 180
+
+-
+  type: "table"
+  title: "Performance trending dashboard 2t1c-2n-clx pdr"
+  algorithm: "table_perf_trending_dash"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-clx-pdr"
+  data: "table-ndrpdr-comparison-2n-clx"
+  filter: "'NDRPDR' and '2T1C'"
+  include-tests: "PDR"
+  parameters:
+    - "name"
+    - "parent"
+    - "throughput"
+  window: 14
+  long-trend-window: 180
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 2t1c-2n-clx ndr"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-clx-ndr.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-clx-ndr.rst"
+  testbed: "2n-clx"
+  add-links: False
+
+-
+  type: "table"
+  title: "HTML performance trending dashboard 2t1c-2n-clx pdr"
+  algorithm: "table_perf_trending_dash_html"
+  input-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-clx-pdr.csv"
+  output-file: "{DIR[STATIC,VPP]}/performance-trending-dashboard-2t1c-2n-clx-pdr.rst"
+  testbed: "2n-clx"
+  add-links: False
+
 -
   type: "table"
   title: "Failed MRR tests 3n-hsw"
@@ -817,10 +1091,6 @@
   - "name"
   - "parent"
   - "status"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-1t1c-eth-l2bdscale1mmaclrn-ndrdisc"
   window: 7  # days
 
 -
@@ -845,10 +1115,6 @@
   - "name"
   - "parent"
   - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-2t1c-eth-l2bdscale1mmaclrn-ndrdisc"
   window: 14
   long-trend-window: 180
 
@@ -864,10 +1130,6 @@
   - "name"
   - "parent"
   - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc05-64b-4t2c-eth-l2bdscale1mmaclrn-ndrdisc"
   window: 14
   long-trend-window: 180
 
@@ -883,10 +1145,6 @@
   - "name"
   - "parent"
   - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc09-64b-8t4c-eth-l2bdscale1mmaclrn-ndrdisc"
   window: 14
   long-trend-window: 180
 
@@ -926,10 +1184,6 @@
   - "name"
   - "parent"
   - "status"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-2t1c-eth-l2bdscale1mmaclrn-ndrdisc"
   window: 7  # days
 
 -
@@ -954,10 +1208,6 @@
   - "name"
   - "parent"
   - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-2t1c-eth-l2bdscale1mmaclrn-ndrdisc"
   window: 14
   long-trend-window: 180
 
@@ -973,10 +1223,6 @@
   - "name"
   - "parent"
   - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc05-64b-4t2c-eth-l2bdscale1mmaclrn-ndrdisc"
   window: 14
   long-trend-window: 180
 
@@ -992,10 +1238,6 @@
   - "name"
   - "parent"
   - "result"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc09-64b-8t4c-eth-l2bdscale1mmaclrn-ndrdisc"
   window: 14
   long-trend-window: 180
 
@@ -1035,10 +1277,6 @@
   - "name"
   - "parent"
   - "status"
-  ignore-list:
-    # This test is "ndrdisc" test and was improperly tagged. It was fixed
-    # but it remains in the old output.xml files.
-  - "tests.vpp.perf.l2.10ge2p1x520-eth-l2bdscale1mmaclrn-mrr.tc01-64b-2t1c-eth-l2bdscale1mmaclrn-ndrdisc"
   window: 7  # days
 
 -
Integration tests