Trending: Add alerts for NDRPDR weekly tests

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

6 files changed, 295 insertions, 1090 deletions

diff --git a/docs/cpta/introduction/failures.rst b/docs/cpta/introduction/failures.rst
index f49a7fc26a..214b87c455 100644
--- a/docs/cpta/introduction/failures.rst
+++ b/docs/cpta/introduction/failures.rst
@@ -13,37 +13,57 @@ Legend to the tables:
     - **Last Failure [VPP-Build-Id]**: VPP build as of last failure.
     - **Last Failure [CSIT-Job-Build-Id]**: CSIT build as of last failure.
 
-2n-skx
-------
+2n-skx-mrr
+----------
 
 .. include:: ../../../_build/_static/vpp/failed-tests-2n-skx.rst
 
-3n-skx
-------
+2n-skx-ndrpdr
+-------------
+
+.. include:: ../../../_build/_static/vpp/failed-tests-2n-skx-ndrpdr.rst
+
+3n-skx-mrr
+----------
 
 .. include:: ../../../_build/_static/vpp/failed-tests-3n-skx.rst
 
-3n-hsw
-------
+3n-skx-ndrpdr
+-------------
+
+.. include:: ../../../_build/_static/vpp/failed-tests-3n-skx-ndrpdr.rst
+
+3n-hsw-mrr
+----------
 
 .. include:: ../../../_build/_static/vpp/failed-tests-3n-hsw.rst
 
-3n-tsh
-------
+3n-hsw-ndrpdr
+-------------
+
+.. include:: ../../../_build/_static/vpp/failed-tests-3n-hsw-ndrpdr.rst
+
+3n-tsh-mrr
+----------
 
 .. include:: ../../../_build/_static/vpp/failed-tests-3n-tsh.rst
 
-2n-dnv
-------
+2n-dnv-mrr
+----------
 
 .. include:: ../../../_build/_static/vpp/failed-tests-2n-dnv.rst
 
-3n-dnv
-------
+3n-dnv-mrr
+----------
 
 .. include:: ../../../_build/_static/vpp/failed-tests-3n-dnv.rst
 
-2n-clx
-------
+2n-clx-mrr
+----------
 
 .. include:: ../../../_build/_static/vpp/failed-tests-2n-clx.rst
+
+2n-clx-ndrpdr
+-------------
+
+.. include:: ../../../_build/_static/vpp/failed-tests-2n-clx-ndrpdr.rst
diff --git a/docs/cpta/ndrpdr_trending/container_memif-3n-hsw-xl710.rst b/docs/cpta/ndrpdr_trending/container_memif-3n-hsw-xl710.rst
index 8361822312..a94056c361 100644
--- a/docs/cpta/ndrpdr_trending/container_memif-3n-hsw-xl710.rst
+++ b/docs/cpta/ndrpdr_trending/container_memif-3n-hsw-xl710.rst
@@ -1,5 +1,5 @@
 3n-hsw-xl710
------------
+------------
 
 64b-memif-base-dpdk
 ```````````````````
diff --git a/docs/cpta/ndrpdr_trending/ip4-3n-hsw-x710.rst b/docs/cpta/ndrpdr_trending/ip4-3n-hsw-x710.rst
index a07eec9c89..25e29f9056 100644
--- a/docs/cpta/ndrpdr_trending/ip4-3n-hsw-x710.rst
+++ b/docs/cpta/ndrpdr_trending/ip4-3n-hsw-x710.rst
@@ -66,7 +66,7 @@
     </center>
 
 64b-ip4routing-features-udp-dpdk
-`````````````````````````````````
+````````````````````````````````
 
 1t1c-ndr
 ::::::::
diff --git a/docs/cpta/ndrpdr_trending/ip6-3n-hsw-xl710.rst b/docs/cpta/ndrpdr_trending/ip6-3n-hsw-xl710.rst
index 4f2d0aceb8..754ee7d37e 100644
--- a/docs/cpta/ndrpdr_trending/ip6-3n-hsw-xl710.rst
+++ b/docs/cpta/ndrpdr_trending/ip6-3n-hsw-xl710.rst
@@ -1,5 +1,5 @@
 3n-hsw-xl710
------------
+------------
 
 78b-ip6routing-base-dpdk
 ````````````````````````
diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index eeffc27dd7..739d0b7806 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -1252,6 +1252,10 @@ def table_failed_tests(table, input_data):
     )
     data = input_data.filter_data(table, continue_on_error=True)
 
+    test_type = u"MRR"
+    if u"NDRPDR" in table.get(u"filter", list()):
+        test_type = u"NDRPDR"
+
     # Prepare the header of the tables
     header = [
         u"Test Case",
@@ -1315,15 +1319,14 @@ def table_failed_tests(table, input_data):
                 fails_last_csit = val[3]
         if fails_nr:
             max_fails = fails_nr if fails_nr > max_fails else max_fails
-            tbl_lst.append(
-                [
-                    tst_data[u"name"],
-                    fails_nr,
-                    fails_last_date,
-                    fails_last_vpp,
-                    f"mrr-daily-build-{fails_last_csit}"
-                ]
-            )
+            tbl_lst.append([
+                tst_data[u"name"],
+                fails_nr,
+                fails_last_date,
+                fails_last_vpp,
+                f"{u'mrr-daily' if test_type == u'MRR' else u'ndrpdr-weekly'}"
+                f"-build-{fails_last_csit}"
+            ])
 
     tbl_lst.sort(key=lambda rel: rel[2], reverse=True)
     tbl_sorted = list()
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index 2f0f125e45..5684f8f544 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -133,6 +133,10 @@
           - "last-failed-tests-3n-tsh"
           - "last-failed-tests-2n-dnv"
           - "last-failed-tests-3n-dnv"
+          - "last-failed-tests-2n-skx-ndrpdr"
+          - "last-failed-tests-3n-skx-ndrpdr"
+          - "last-failed-tests-2n-clx-ndrpdr"
+          - "last-failed-tests-3n-hsw-ndrpdr"
         urls:
           - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx"
           - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx"
@@ -141,6 +145,10 @@
           - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-tsh"
           - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-dnv"
           - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-dnv"
+          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx"
+          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx"
+          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx"
+          - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-hsw"
         url-details: "https://docs.fd.io/csit/master/trending/introduction/failures.html"
 
     configurations:
@@ -177,9 +185,6 @@
     table-last-failed-tests-2n-skx:
       csit-vpp-perf-mrr-daily-master-2n-skx:
         - "lastCompletedBuild"
-    table-last-failed-tests-nf-2n-skx:
-      csit-vpp-perf-mrr-weekly-master-2n-skx:
-        - "lastCompletedBuild"
     table-last-failed-tests-2n-clx:
       csit-vpp-perf-mrr-daily-master-2n-clx:
         - "lastCompletedBuild"
@@ -192,136 +197,32 @@
     table-last-failed-tests-2n-dnv:
       csit-vpp-perf-mrr-daily-master-2n-dnv:
         - "lastCompletedBuild"
+    table-last-failed-tests-3n-hsw-ndrpdr:
+      csit-vpp-perf-ndrpdr-weekly-master-3n-hsw:
+        - "lastCompletedBuild"
+    table-last-failed-tests-3n-skx-ndrpdr:
+      csit-vpp-perf-ndrpdr-weekly-master-3n-skx:
+        - "lastCompletedBuild"
+    table-last-failed-tests-2n-skx-ndrpdr:
+      csit-vpp-perf-ndrpdr-weekly-master-2n-skx:
+        - "lastCompletedBuild"
+    table-last-failed-tests-2n-clx-ndrpdr:
+      csit-vpp-perf-ndrpdr-weekly-master-2n-clx:
+        - "lastCompletedBuild"
 
     # 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)
-        start: 894
-=======
-        start: 965
->>>>>>> CHANGE (b51708 Trending: Plots)
-=======
-        start: 1035
->>>>>>> CHANGE (01597c Trending: Update graphs)
-=======
-        start: 1082
->>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
-=======
         start: 1086
->>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
         end: "lastCompletedBuild"
-<<<<<<< HEAD   (fdbb41 Report: Add 1908.2 data)
-<<<<<<< HEAD   (89bdc8 Trending: Fixes in plots, data)
-        skip:
-<<<<<<< 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
-          - 900
-          - 901
-          - 902
-          - 903
-          - 904
-          - 921
-          - 922
-          - 935
-          - 936
-          - 937
-          - 938
-          - 939
-          - 940
-          - 941
-          - 953
-=======
->>>>>>> CHANGE (b51708 Trending: Plots)
-          - 987
-=======
->>>>>>> CHANGE (01597c Trending: Update graphs)
-          - 1052
-<<<<<<< HEAD   (d3ea22 Report: Add data)
-=======
-          - 1054
-          - 1056
-          - 1063
-=======
->>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
-          - 1102
->>>>>>> CHANGE (b51708 Trending: Plots)
-=======
-        max-builds: 180  # Max nr of builds to use
->>>>>>> CHANGE (1945eb PAL: Reverse download order for trending)
-=======
->>>>>>> CHANGE (e260db Trending: NDRPDR weekly comparison)
       csit-dpdk-perf-mrr-weekly-master:
         start: 107
         end: "lastCompletedBuild"
 
     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)
-        start: 894
-=======
-        start: 965
->>>>>>> CHANGE (b51708 Trending: Plots)
-=======
-        start: 1035
->>>>>>> CHANGE (01597c Trending: Update graphs)
-=======
-        start: 1082
->>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
-=======
         start: 1086
->>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
         end: "lastCompletedBuild"
-<<<<<<< HEAD   (fdbb41 Report: Add 1908.2 data)
-<<<<<<< HEAD   (89bdc8 Trending: Fixes in plots, data)
-        skip:
-<<<<<<< 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
-          - 900
-          - 901
-          - 902
-          - 903
-          - 904
-          - 921
-          - 922
-          - 935
-          - 936
-          - 937
-          - 938
-          - 939
-          - 940
-          - 941
-          - 953
-=======
->>>>>>> CHANGE (b51708 Trending: Plots)
-          - 987
-=======
->>>>>>> CHANGE (01597c Trending: Update graphs)
-          - 1052
-<<<<<<< HEAD   (d3ea22 Report: Add data)
-=======
-          - 1054
-          - 1056
-          - 1063
-=======
->>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
-          - 1102
->>>>>>> CHANGE (b51708 Trending: Plots)
-=======
-        max-builds: 180  # Max nr of builds to use
->>>>>>> CHANGE (1945eb PAL: Reverse download order for trending)
-=======
->>>>>>> CHANGE (e260db Trending: NDRPDR weekly comparison)
 
     plot-performance-trending-dpdk-3n-hsw:
       csit-dpdk-perf-mrr-weekly-master:
@@ -331,170 +232,16 @@
     # 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)
-        start: 635
-=======
-        start: 707
->>>>>>> CHANGE (b51708 Trending: Plots)
-=======
-        start: 782
->>>>>>> CHANGE (01597c Trending: Update graphs)
-=======
-        start: 830
->>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
-=======
         start: 834
->>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
         end: "lastCompletedBuild"
-<<<<<<< HEAD   (fdbb41 Report: Add 1908.2 data)
-<<<<<<< HEAD   (89bdc8 Trending: Fixes in plots, data)
-        skip:
-<<<<<<< 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)
-          - 641
-          - 642
-          - 643
-          - 644
-          - 645
-          - 646
-          - 662
-          - 663
-          - 683
-          - 684
-          - 685
-          - 686
-          - 687
-          - 694
-          - 695
-          - 696
-          - 697
-          - 705
-=======
->>>>>>> CHANGE (b51708 Trending: Plots)
-          - 743
-          - 749
-          - 761
-=======
->>>>>>> CHANGE (01597c Trending: Update graphs)
-          - 796
-<<<<<<< HEAD   (d3ea22 Report: Add data)
-=======
-          - 803
-          - 804
-          - 805
-          - 818
-=======
->>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
-          - 849
-<<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
->>>>>>> CHANGE (b51708 Trending: Plots)
-=======
-          - 851
-<<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
->>>>>>> CHANGE (01597c Trending: Update graphs)
-=======
-          - 862
-          - 864
-<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
->>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
-=======
-          - 865
-          - 866
->>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
-=======
-        max-builds: 180  # Max nr of builds to use
->>>>>>> CHANGE (1945eb PAL: Reverse download order for trending)
-=======
->>>>>>> CHANGE (e260db Trending: NDRPDR weekly comparison)
       csit-dpdk-perf-mrr-weekly-master-3n-skx:
         start: 72
         end: "lastCompletedBuild"
 
     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)
-        start: 635
-=======
-        start: 707
->>>>>>> CHANGE (b51708 Trending: Plots)
-=======
-        start: 782
->>>>>>> CHANGE (01597c Trending: Update graphs)
-=======
-        start: 830
->>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
-=======
         start: 834
->>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
         end: "lastCompletedBuild"
-<<<<<<< HEAD   (fdbb41 Report: Add 1908.2 data)
-<<<<<<< HEAD   (89bdc8 Trending: Fixes in plots, data)
-        skip:
-<<<<<<< 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)
-          - 641
-          - 642
-          - 643
-          - 644
-          - 645
-          - 646
-          - 662
-          - 663
-          - 683
-          - 684
-          - 685
-          - 686
-          - 687
-          - 694
-          - 695
-          - 696
-          - 697
-          - 705
-=======
->>>>>>> CHANGE (b51708 Trending: Plots)
-          - 743
-          - 749
-          - 761
-=======
->>>>>>> CHANGE (01597c Trending: Update graphs)
-          - 796
-<<<<<<< HEAD   (d3ea22 Report: Add data)
-=======
-          - 803
-          - 804
-          - 805
-          - 818
-=======
->>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
-          - 849
-<<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
->>>>>>> CHANGE (b51708 Trending: Plots)
-=======
-          - 851
-<<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
->>>>>>> CHANGE (01597c Trending: Update graphs)
-=======
-          - 862
-          - 864
-<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
->>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
-=======
-          - 865
-          - 866
->>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
-=======
-        max-builds: 180  # Max nr of builds to use
->>>>>>> CHANGE (1945eb PAL: Reverse download order for trending)
-=======
->>>>>>> CHANGE (e260db Trending: NDRPDR weekly comparison)
 
     plot-performance-trending-dpdk-3n-skx:
       csit-dpdk-perf-mrr-weekly-master-3n-skx:
@@ -504,143 +251,16 @@
     # 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)
-        start: 647
-=======
-        start: 729
->>>>>>> CHANGE (b51708 Trending: Plots)
-=======
-        start: 804
->>>>>>> CHANGE (01597c Trending: Update graphs)
-=======
-        start: 856
->>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
-=======
         start: 858
->>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
         end: "lastCompletedBuild"
-<<<<<<< HEAD   (fdbb41 Report: Add 1908.2 data)
-<<<<<<< HEAD   (89bdc8 Trending: Fixes in plots, data)
-        skip:
-<<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
-<<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
-          - 653
-          - 654
-          - 655
-          - 656
-          - 657
-          - 658
-          - 675
-          - 676
-          - 693
-          - 694
-          - 695
-          - 696
-          - 697
-          - 698
-          - 699
-          - 700
-          - 701
-          - 702
-          - 768
-<<<<<<< HEAD   (d3ea22 Report: Add data)
-=======
-=======
->>>>>>> CHANGE (01597c Trending: Update graphs)
-          - 828
-          - 830
-<<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
->>>>>>> CHANGE (b51708 Trending: Plots)
-=======
-=======
->>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
-          - 868
-          - 870
-          - 874
->>>>>>> CHANGE (01597c Trending: Update graphs)
-=======
-        max-builds: 180  # Max nr of builds to use
->>>>>>> CHANGE (1945eb PAL: Reverse download order for trending)
-=======
->>>>>>> CHANGE (e260db Trending: NDRPDR weekly comparison)
       csit-dpdk-perf-mrr-weekly-master-2n-skx:
         start: 78
         end: "lastCompletedBuild"
 
     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)
-        start: 647
-=======
-        start: 729
->>>>>>> CHANGE (b51708 Trending: Plots)
-=======
-        start: 804
->>>>>>> CHANGE (01597c Trending: Update graphs)
-=======
-        start: 856
->>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
-=======
         start: 858
->>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
-        end: "lastCompletedBuild"
-<<<<<<< HEAD   (fdbb41 Report: Add 1908.2 data)
-<<<<<<< HEAD   (89bdc8 Trending: Fixes in plots, data)
-        skip:
-<<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
-<<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
-          - 653
-          - 654
-          - 655
-          - 656
-          - 657
-          - 658
-          - 675
-          - 676
-          - 693
-          - 694
-          - 695
-          - 696
-          - 697
-          - 698
-          - 699
-          - 700
-          - 701
-          - 702
-          - 768
-<<<<<<< HEAD   (d3ea22 Report: Add data)
-
-    plot-performance-trending-vpp-2n-clx:
-      csit-vpp-perf-mrr-daily-master-2n-clx:
-        start: 89
         end: "lastCompletedBuild"
-        skip:
-          - 97
-=======
-=======
->>>>>>> CHANGE (01597c Trending: Update graphs)
-          - 828
-          - 830
-<<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
->>>>>>> CHANGE (b51708 Trending: Plots)
-=======
-=======
->>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
-          - 868
-          - 870
-          - 874
->>>>>>> CHANGE (01597c Trending: Update graphs)
-=======
-        max-builds: 180  # Max nr of builds to use
->>>>>>> CHANGE (1945eb PAL: Reverse download order for trending)
-=======
->>>>>>> CHANGE (e260db Trending: NDRPDR weekly comparison)
 
     plot-performance-trending-dpdk-2n-skx:
       csit-dpdk-perf-mrr-weekly-master-2n-skx:
@@ -652,8 +272,6 @@
         start: 50
         end: "lastCompletedBuild"
 
-<<<<<<< HEAD   (d3ea22 Report: Add data)
-=======
     plot-performance-trending-vpp-2n-clx:
       csit-vpp-perf-mrr-daily-master-2n-clx:
         start: 236
@@ -664,229 +282,30 @@
         start: 23
         end: "lastCompletedBuild"
 
->>>>>>> CHANGE (b51708 Trending: Plots)
     # 3n-tsh
     plot-performance-trending-all-3n-tsh:
       csit-vpp-perf-mrr-daily-master-3n-tsh:
         start: 144
         end: "lastCompletedBuild"
-<<<<<<< HEAD   (fdbb41 Report: Add 1908.2 data)
-<<<<<<< HEAD   (89bdc8 Trending: Fixes in plots, data)
-        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)
-=======
-=======
->>>>>>> CHANGE (01597c Trending: Update graphs)
-          - 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)
-=======
-          - 150
-          - 152
-          - 153
-          - 154
-          - 155
-          - 156
-          - 157
->>>>>>> CHANGE (01597c Trending: Update graphs)
-=======
-        max-builds: 180  # Max nr of builds to use
->>>>>>> CHANGE (1945eb PAL: Reverse download order for trending)
-=======
->>>>>>> CHANGE (e260db Trending: NDRPDR weekly comparison)
 
     plot-performance-trending-vpp-3n-tsh:
       csit-vpp-perf-mrr-daily-master-3n-tsh:
         start: 144
         end: "lastCompletedBuild"
-<<<<<<< HEAD   (fdbb41 Report: Add 1908.2 data)
-<<<<<<< HEAD   (89bdc8 Trending: Fixes in plots, data)
-        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)
-=======
-=======
->>>>>>> CHANGE (01597c Trending: Update graphs)
-          - 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)
-=======
-          - 150
-          - 152
-          - 153
-          - 154
-          - 155
-          - 156
-          - 157
->>>>>>> CHANGE (01597c Trending: Update graphs)
-=======
-        max-builds: 180  # Max nr of builds to use
->>>>>>> CHANGE (1945eb PAL: Reverse download order for trending)
-=======
->>>>>>> CHANGE (e260db Trending: NDRPDR weekly comparison)
 
+    # 3n-dnv
     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
-=======
-        start: 203
->>>>>>> CHANGE (b51708 Trending: Plots)
-=======
-        start: 276
->>>>>>> CHANGE (01597c Trending: Update graphs)
-=======
         start: 329
->>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
         end: "lastCompletedBuild"
-<<<<<<< HEAD   (fdbb41 Report: Add 1908.2 data)
-<<<<<<< HEAD   (89bdc8 Trending: Fixes in plots, data)
-        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
-          - 151
-          - 175
-          - 176
-=======
->>>>>>> CHANGE (b51708 Trending: Plots)
-          - 227
-          - 228
-          - 246
-          - 247
-          - 248
-<<<<<<< HEAD   (d3ea22 Report: Add data)
-=======
-=======
->>>>>>> CHANGE (01597c Trending: Update graphs)
-          - 297
-          - 318
-          - 319
-          - 320
-          - 321
-          - 322
-          - 323
-          - 324
-          - 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)
-=======
-          - 344
-          - 345
-          - 348
-          - 350
-          - 356
-          - 357
-          - 358
-          - 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)
-=======
-        max-builds: 180  # Max nr of builds to use
->>>>>>> CHANGE (1945eb PAL: Reverse download order for trending)
-=======
->>>>>>> CHANGE (e260db Trending: NDRPDR weekly comparison)
 
+    # 2n-dnv
     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
-=======
-        start: 203
->>>>>>> CHANGE (b51708 Trending: Plots)
-=======
-        start: 279
->>>>>>> CHANGE (01597c Trending: Update graphs)
-=======
         start: 335
->>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
         end: "lastCompletedBuild"
-<<<<<<< HEAD   (89bdc8 Trending: Fixes in plots, data)
-        skip:
-<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
-          - 145
-          - 149
-          - 150
-          - 228
-          - 249
-          - 250
-          - 251
-<<<<<<< HEAD   (d3ea22 Report: Add data)
-=======
-          - 302
-          - 304
-          - 314
-          - 317
-          - 326
-          - 327
-          - 328
-          - 329
-          - 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)
->>>>>>> CHANGE (b51708 Trending: Plots)
-=======
-          - 350
-          - 351
-          - 354
-          - 360
-          - 364
-          - 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)
-=======
->>>>>>> CHANGE (1945eb PAL: Reverse download order for trending)
 
+    # NDRPDR
     plot-ndrpdr-comparison-2n-skx:
       csit-vpp-perf-ndrpdr-weekly-master-2n-skx:
         start: 76
@@ -1065,64 +484,12 @@
 
     # 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)
-      start: 894
-=======
-      start: 965
->>>>>>> CHANGE (b51708 Trending: Plots)
-=======
-      start: 1035
->>>>>>> CHANGE (01597c Trending: Update graphs)
-=======
-      start: 1082
->>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
-=======
       start: 1086
->>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
       end: "lastCompletedBuild"
       max-builds: 180  # Max nr of builds to download
       skip:
-<<<<<<< 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
-        - 900
-        - 901
-        - 902
-        - 903
-        - 904
-        - 921
-        - 922
-        - 935
-        - 936
-        - 937
-        - 938
-        - 939
-        - 940
-        - 941
-        - 953
-=======
->>>>>>> CHANGE (b51708 Trending: Plots)
-        - 987
-=======
->>>>>>> CHANGE (01597c Trending: Update graphs)
-        - 1052
-<<<<<<< HEAD   (d3ea22 Report: Add data)
-=======
-        - 1054
-        - 1056
-        - 1063
-=======
->>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
         - 1102
-<<<<<<< HEAD   (8189a4 Report: Add data)
->>>>>>> CHANGE (b51708 Trending: Plots)
-=======
         - 1159
->>>>>>> CHANGE (60d006 Trending: CSIT-1301: Display stdev in hover info)
     csit-dpdk-perf-mrr-weekly-master:
       start: 113
       end: "lastCompletedBuild"
@@ -1132,83 +499,17 @@
 
     # 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)
-      start: 635
-=======
-      start: 707
->>>>>>> CHANGE (b51708 Trending: Plots)
-=======
-      start: 782
->>>>>>> CHANGE (01597c Trending: Update graphs)
-=======
-      start: 830
->>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
-=======
       start: 834
->>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
       end: "lastCompletedBuild"
       max-builds: 180  # Max nr of builds to download
       skip:
-<<<<<<< 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)
-        - 641
-        - 642
-        - 643
-        - 644
-        - 645
-        - 646
-        - 662
-        - 663
-        - 683
-        - 684
-        - 685
-        - 686
-        - 687
-        - 694
-        - 695
-        - 696
-        - 697
-        - 705
-=======
->>>>>>> CHANGE (b51708 Trending: Plots)
-        - 743
-        - 749
-        - 761
-=======
->>>>>>> CHANGE (01597c Trending: Update graphs)
-        - 796
-<<<<<<< HEAD   (d3ea22 Report: Add data)
-=======
-        - 803
-        - 804
-        - 805
-        - 818
-=======
->>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
         - 849
-<<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
->>>>>>> CHANGE (b51708 Trending: Plots)
-=======
         - 851
-<<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
->>>>>>> CHANGE (01597c Trending: Update graphs)
-=======
         - 862
         - 864
-<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
->>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
-=======
         - 865
         - 866
-<<<<<<< HEAD   (8189a4 Report: Add data)
->>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
-=======
         - 867
->>>>>>> CHANGE (60d006 Trending: CSIT-1301: Display stdev in hover info)
     csit-dpdk-perf-mrr-weekly-master-3n-skx:
       start: 78
       end: "lastCompletedBuild"
@@ -1218,66 +519,14 @@
 
     # 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)
-      start: 647
-=======
-      start: 729
->>>>>>> CHANGE (b51708 Trending: Plots)
-=======
-      start: 804
->>>>>>> CHANGE (01597c Trending: Update graphs)
-=======
-      start: 856
->>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
-=======
       start: 858
->>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
       end: "lastCompletedBuild"
       max-builds: 180  # Max nr of builds to download
       skip:
-<<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
-<<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
-        - 653
-        - 654
-        - 655
-        - 656
-        - 657
-        - 658
-        - 675
-        - 676
-        - 693
-        - 694
-        - 695
-        - 696
-        - 697
-        - 698
-        - 699
-        - 700
-        - 701
-        - 702
-        - 768
-<<<<<<< HEAD   (d3ea22 Report: Add data)
-=======
-=======
->>>>>>> CHANGE (01597c Trending: Update graphs)
-        - 828
-        - 830
-<<<<<<< HEAD   (b54dc7 PAL: Local mode uses xml file name as a build number)
->>>>>>> CHANGE (b51708 Trending: Plots)
-=======
-=======
->>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
         - 868
         - 870
         - 874
-<<<<<<< HEAD   (8189a4 Report: Add data)
->>>>>>> CHANGE (01597c Trending: Update graphs)
-=======
         - 889
->>>>>>> CHANGE (60d006 Trending: CSIT-1301: Display stdev in hover info)
     csit-vpp-perf-mrr-weekly-master-2n-skx:
       start: 50
       end: "lastCompletedBuild"
@@ -1298,30 +547,6 @@
       end: "lastCompletedBuild"
       max-builds: 180  # Max nr of builds to download
       skip:
-<<<<<<< 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)
-        - 97
-=======
-        - 121
-        - 153
-        - 154
-        - 155
-=======
->>>>>>> CHANGE (01597c Trending: Update graphs)
-        - 204
-        - 206
-        - 208
-        - 213
-        - 214
-        - 215
-        - 216
-        - 217
-        - 224
-        - 230
-        - 231
-=======
->>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
         - 239
         - 248
         - 251
@@ -1334,17 +559,7 @@
       end: "lastCompletedBuild"
       max-builds: 15  # Max nr of builds to download
       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:
@@ -1352,22 +567,7 @@
       end: "lastCompletedBuild"
       max-builds: 180  # Max nr of builds to download
       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)
-=======
-=======
->>>>>>> CHANGE (01597c Trending: Update graphs)
-        - 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)
-=======
         - 150
         - 152
         - 153
@@ -1375,65 +575,15 @@
         - 155
         - 156
         - 157
-<<<<<<< HEAD   (8189a4 Report: Add data)
->>>>>>> CHANGE (01597c Trending: Update graphs)
-=======
         - 192
->>>>>>> CHANGE (60d006 Trending: CSIT-1301: Display stdev in hover info)
 
     # 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
-=======
-      start: 203
->>>>>>> CHANGE (b51708 Trending: Plots)
-=======
-      start: 276
->>>>>>> CHANGE (01597c Trending: Update graphs)
-=======
       start: 329
->>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
       end: "lastCompletedBuild"
       max-builds: 180  # Max nr of builds to download
       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
-        - 151
-        - 175
-        - 176
-=======
->>>>>>> CHANGE (b51708 Trending: Plots)
-        - 227
-        - 228
-        - 246
-        - 247
-        - 248
-<<<<<<< HEAD   (d3ea22 Report: Add data)
-=======
-=======
->>>>>>> CHANGE (01597c Trending: Update graphs)
-        - 297
-        - 318
-        - 319
-        - 320
-        - 321
-        - 322
-        - 323
-        - 324
-        - 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)
-=======
         - 344
         - 345
         - 348
@@ -1444,67 +594,22 @@
         - 360
         - 363
         - 364
-<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
->>>>>>> CHANGE (01597c Trending: Update graphs)
-=======
         - 381
         - 387
         - 388
         - 390
         - 391
         - 392
-<<<<<<< HEAD   (8189a4 Report: Add data)
->>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
-=======
         - 396
->>>>>>> CHANGE (60d006 Trending: CSIT-1301: Display stdev in hover info)
 
     # 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
-=======
-      start: 203
->>>>>>> CHANGE (b51708 Trending: Plots)
-=======
-      start: 279
->>>>>>> CHANGE (01597c Trending: Update graphs)
-=======
       start: 335
->>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
       end: "lastCompletedBuild"
       max-builds: 180  # Max nr of builds to download
       skip:
-<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
-        - 145
-        - 149
-        - 150
-        - 228
-        - 249
-        - 250
-        - 251
-<<<<<<< HEAD   (d3ea22 Report: Add data)
-=======
-        - 302
-        - 304
-        - 314
-        - 317
-        - 326
-        - 327
-        - 328
-        - 329
-        - 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)
->>>>>>> CHANGE (b51708 Trending: Plots)
-=======
         - 350
         - 351
         - 354
@@ -1513,20 +618,13 @@
         - 365
         - 366
         - 370
-<<<<<<< HEAD   (f7dd81 Trending: Update graphs - dnv)
->>>>>>> CHANGE (01597c Trending: Update graphs)
-=======
         - 378
         - 387
         - 394
         - 395
         - 396
         - 397
-<<<<<<< HEAD   (8189a4 Report: Add data)
->>>>>>> CHANGE (12d5c9 Trending: Fixes in plots, data)
-=======
         - 402
->>>>>>> CHANGE (60d006 Trending: CSIT-1301: Display stdev in hover info)
 
 -
   type: "output"
@@ -1753,6 +851,58 @@
     - "parent"
     - "status"
 
+-
+  type: "table"
+  title: "Last failed tests (last builds) 3n-hsw-ndrpdr"
+  algorithm: "table_last_failed_tests"
+  output-file-ext: ".txt"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-3n-hsw-ndrpdr"
+  data: "table-last-failed-tests-3n-hsw-ndrpdr"
+  filter: "'NDRPDR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+
+-
+  type: "table"
+  title: "Last failed tests (last builds) 3n-skx-ndrpdr"
+  algorithm: "table_last_failed_tests"
+  output-file-ext: ".txt"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-3n-skx-ndrpdr"
+  data: "table-last-failed-tests-3n-skx-ndrpdr"
+  filter: "'NDRPDR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+
+-
+  type: "table"
+  title: "Last failed tests (last builds) 2n-skx-ndrpdr"
+  algorithm: "table_last_failed_tests"
+  output-file-ext: ".txt"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-2n-skx-ndrpdr"
+  data: "table-last-failed-tests-2n-skx-ndrpdr"
+  filter: "'NDRPDR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+
+-
+  type: "table"
+  title: "Last failed tests (last builds) 2n-clx-ndrpdr"
+  algorithm: "table_last_failed_tests"
+  output-file-ext: ".txt"
+  output-file: "{DIR[STATIC,VPP]}/last-failed-tests-2n-clx-ndrpdr"
+  data: "table-last-failed-tests-2n-clx-ndrpdr"
+  filter: "'NDRPDR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+
 # 3n-hsw
 -
   type: "table"
@@ -1763,9 +913,9 @@
   data: "plot-performance-trending-all-3n-hsw"
   filter: "'MRR' and '1T1C' and not 'NIC_Intel-XXV710'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
@@ -1778,9 +928,9 @@
   data: "plot-performance-trending-all-3n-hsw"
   filter: "'MRR' and '2T2C' and not 'NIC_Intel-XXV710'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
@@ -1793,9 +943,9 @@
   data: "plot-performance-trending-all-3n-hsw"
   filter: "'MRR' and '4T4C' and not 'NIC_Intel-XXV710'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
@@ -2027,7 +1177,7 @@
   testbed: "2n-clx"
   add-links: False
 
--
+#-
   type: "table"
   title: "Failed MRR tests 3n-hsw"
   algorithm: "table_failed_tests"
@@ -2036,9 +1186,9 @@
   data: "plot-performance-trending-all-3n-hsw"
   filter: "'MRR' and not 'NIC_Intel-XXV710'"
   parameters:
-  - "name"
-  - "parent"
-  - "status"
+    - "name"
+    - "parent"
+    - "status"
   window: 7  # days
 
 -
@@ -2049,6 +1199,28 @@
   output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-hsw.rst"
   testbed: "3n-hsw"
 
+-
+  type: "table"
+  title: "Failed NDRPDR tests 3n-hsw"
+  algorithm: "table_failed_tests"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-hsw-ndrpdr"
+  data: "plot-ndrpdr-comparison-3n-hsw"
+  filter: "'NDRPDR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+  window: 30  # days
+
+-
+  type: "table"
+  title: "HTML Failed NDRPDR tests 3n-hsw"
+  algorithm: "table_failed_tests_html"
+  input-file: "{DIR[STATIC,VPP]}/failed-tests-3n-hsw-ndrpdr.csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-hsw-ndrpdr.rst"
+  testbed: "3n-hsw"
+
 ################################################################################
 # 3n-skx
 -
@@ -2060,9 +1232,9 @@
   data: "plot-performance-trending-all-3n-skx"
   filter: "'MRR' and '2T1C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
@@ -2075,9 +1247,9 @@
   data: "plot-performance-trending-all-3n-skx"
   filter: "'MRR' and '4T2C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
@@ -2090,9 +1262,9 @@
   data: "plot-performance-trending-all-3n-skx"
   filter: "'MRR' and '8T4C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
@@ -2129,9 +1301,9 @@
   data: "plot-performance-trending-all-3n-skx"
   filter: "'MRR'"
   parameters:
-  - "name"
-  - "parent"
-  - "status"
+    - "name"
+    - "parent"
+    - "status"
   window: 7  # days
 
 -
@@ -2142,6 +1314,28 @@
   output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-skx.rst"
   testbed: "3n-skx"
 
+-
+  type: "table"
+  title: "Failed NDRPDR tests 3n-skx"
+  algorithm: "table_failed_tests"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-skx-ndrpdr"
+  data: "plot-ndrpdr-comparison-3n-skx"
+  filter: "'NDRPDR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+  window: 30  # days
+
+-
+  type: "table"
+  title: "HTML Failed NDRPDR tests 3n-skx"
+  algorithm: "table_failed_tests_html"
+  input-file: "{DIR[STATIC,VPP]}/failed-tests-3n-skx-ndrpdr.csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-3n-skx-ndrpdr.rst"
+  testbed: "3n-skx"
+
 ################################################################################
 # 2n-skx
 -
@@ -2153,9 +1347,9 @@
   data: "plot-performance-trending-all-2n-skx"
   filter: "'MRR' and '2T1C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
@@ -2168,9 +1362,9 @@
   data: "plot-performance-trending-all-2n-skx"
   filter: "'MRR' and '4T2C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
@@ -2183,9 +1377,9 @@
   data: "plot-performance-trending-all-2n-skx"
   filter: "'MRR' and '8T4C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
@@ -2222,9 +1416,9 @@
   data: "plot-performance-trending-all-2n-skx"
   filter: "'MRR'"
   parameters:
-  - "name"
-  - "parent"
-  - "status"
+    - "name"
+    - "parent"
+    - "status"
   window: 7  # days
 
 -
@@ -2235,6 +1429,28 @@
   output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-skx.rst"
   testbed: "2n-skx"
 
+-
+  type: "table"
+  title: "Failed NDRPDR tests 2n-skx"
+  algorithm: "table_failed_tests"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-skx-ndrpdr"
+  data: "plot-ndrpdr-comparison-2n-skx"
+  filter: "'NDRPDR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+  window: 30  # days
+
+-
+  type: "table"
+  title: "HTML Failed NDRPDR tests 2n-skx"
+  algorithm: "table_failed_tests_html"
+  input-file: "{DIR[STATIC,VPP]}/failed-tests-2n-skx-ndrpdr.csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-skx-ndrpdr.rst"
+  testbed: "2n-skx"
+
 ################################################################################
 # 2n-clx
 -
@@ -2246,9 +1462,9 @@
   data: "plot-performance-trending-vpp-2n-clx"
   filter: "'MRR' and '2T1C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
@@ -2261,9 +1477,9 @@
   data: "plot-performance-trending-vpp-2n-clx"
   filter: "'MRR' and '4T2C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
@@ -2276,9 +1492,9 @@
   data: "plot-performance-trending-vpp-2n-clx"
   filter: "'MRR' and '8T4C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
@@ -2315,9 +1531,9 @@
   data: "plot-performance-trending-vpp-2n-clx"
   filter: "'MRR'"
   parameters:
-  - "name"
-  - "parent"
-  - "status"
+    - "name"
+    - "parent"
+    - "status"
   window: 7  # days
 
 -
@@ -2328,9 +1544,30 @@
   output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-clx.rst"
   testbed: "2n-clx"
 
+-
+  type: "table"
+  title: "Failed NDRPDR tests 2n-clx"
+  algorithm: "table_failed_tests"
+  output-file-ext: ".csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-clx-ndrpdr"
+  data: "plot-ndrpdr-comparison-2n-clx"
+  filter: "'NDRPDR'"
+  parameters:
+    - "name"
+    - "parent"
+    - "status"
+  window: 30  # days
 
-################################################################################
-# 3n-tsh
+-
+  type: "table"
+  title: "HTML Failed NDRPDR tests 2n-clx"
+  algorithm: "table_failed_tests_html"
+  input-file: "{DIR[STATIC,VPP]}/failed-tests-2n-clx-ndrpdr.csv"
+  output-file: "{DIR[STATIC,VPP]}/failed-tests-2n-clx-ndrpdr.rst"
+  testbed: "2n-clx"
+
+#################################################################################
+## 3n-tsh
 -
   type: "table"
   title: "Performance trending dashboard 1t1c-3n-tsh"
@@ -2340,9 +1577,9 @@
   data: "plot-performance-trending-all-3n-tsh"
   filter: "'MRR' and '1T1C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
@@ -2370,9 +1607,9 @@
   data: "plot-performance-trending-all-3n-tsh"
   filter: "'MRR' and '4T4C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
@@ -2409,9 +1646,9 @@
   data: "plot-performance-trending-all-3n-tsh"
   filter: "'MRR'"
   parameters:
-  - "name"
-  - "parent"
-  - "status"
+    - "name"
+    - "parent"
+    - "status"
   window: 7  # days
 
 -
@@ -2433,9 +1670,9 @@
   data: "plot-performance-trending-vpp-3n-dnv"
   filter: "'MRR' and '1T1C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
@@ -2448,9 +1685,9 @@
   data: "plot-performance-trending-vpp-3n-dnv"
   filter: "'MRR' and '2T2C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
@@ -2463,9 +1700,9 @@
   data: "plot-performance-trending-vpp-3n-dnv"
   filter: "'MRR' and '4T4C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
@@ -2502,9 +1739,9 @@
   data: "plot-performance-trending-vpp-3n-dnv"
   filter: "'MRR'"
   parameters:
-  - "name"
-  - "parent"
-  - "status"
+    - "name"
+    - "parent"
+    - "status"
   window: 7  # days
 
 -
@@ -2526,9 +1763,9 @@
   data: "plot-performance-trending-vpp-2n-dnv"
   filter: "'MRR' and '1T1C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
@@ -2541,9 +1778,9 @@
   data: "plot-performance-trending-vpp-2n-dnv"
   filter: "'MRR' and '2T2C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
@@ -2556,9 +1793,9 @@
   data: "plot-performance-trending-vpp-2n-dnv"
   filter: "'MRR' and '4T4C'"
   parameters:
-  - "name"
-  - "parent"
-  - "result"
+    - "name"
+    - "parent"
+    - "result"
   window: 14
   long-trend-window: 180
 
@@ -2595,9 +1832,9 @@
   data: "plot-performance-trending-vpp-2n-dnv"
   filter: "'MRR'"
   parameters:
-  - "name"
-  - "parent"
-  - "status"
+    - "name"
+    - "parent"
+    - "status"
   window: 7  # days
 
 -
@@ -2927,10 +2164,6 @@
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Memif-1Dcr-mrr.64B-8t4c-ethip4-ip4base-eth-2memif-1dcr-mrr"
       layout: "plot-cpta"
 
-<<<<<<< HEAD   (d3ea22 Report: Add data)
-    - title: "2n-skx-xxv710-64b-2t1c-memif-base-i40e"
-      output-file-name: "2n-skx-xxv710-64b-2t1c-memif-base-i40e"
-=======
     - title: "2n-clx-cx556a-64b-2t1c-rdma-l2-eth-2memif-1dcr"
       output-file-name: "2n-clx-cx556a-64b-2t1c-rdma-l2-eth-2memif-1dcr"
       data: "plot-performance-trending-vpp-2n-clx"
@@ -2993,7 +2226,6 @@
 
     - title: "2n-skx-xxv710-64b-2t1c-memif-base-dpdk"
       output-file-name: "2n-skx-xxv710-64b-2t1c-memif-base-dpdk"
->>>>>>> CHANGE (b51708 Trending: Plots)
       data: "plot-performance-trending-vpp-2n-skx"
       include:
         - "Tests.Vpp.Perf.Container Memif.2N1L-25Ge2P1Xxv710-Eth-L2Xcbase-Eth-2Memif-1Dcr-mrr.64B-2t1c-eth-l2xcbase-eth-2memif-1dcr-mrr"
@@ -3337,8 +2569,6 @@
         - "Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4Udp-Ip4Base-Nat44-mrr.64B-8t4c-ethip4udp-ip4base-nat44-mrr"
       layout: "plot-cpta"
 
-<<<<<<< HEAD   (d3ea22 Report: Add data)
-=======
     - title: "2n-clx-cx556a-64b-2t1c-rdma-ip4base"
       output-file-name: "2n-clx-cx556a-64b-2t1c-rdma-ip4base"
       data: "plot-performance-trending-vpp-2n-clx"
@@ -3435,7 +2665,6 @@
         - "Tests.Vpp.Perf.Ip4.2N1L-100Ge2P1Cx556A-Rdma-Ethip4Udp-Ip4Scale1000-Udpsrcscale15-Nat44-Mrr.64B-8t4c-rdma-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr"
       layout: "plot-cpta"
 
->>>>>>> CHANGE (b51708 Trending: Plots)
     - title: "2n-dnv-x553-64b-1t1c-ip4routing-base-scale-ixgbe"
       output-file-name: "2n-dnv-x553-64b-1t1c-ip4-ixgbe"
       data: "plot-performance-trending-vpp-2n-dnv"
@@ -4186,8 +3415,6 @@
         - "Tests.Vpp.Perf.Ip6.2N1L-25Ge2P1Xxv710-Ethip6-Ip6Scale2M-mrr.78B-8t4c-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
 
-<<<<<<< HEAD   (d3ea22 Report: Add data)
-=======
     - title: "2n-clx-cx556a-78b-2t1c-rdma-ip6routing-base-scale"
       output-file-name: "2n-clx-cx556a-78b-2t1c-rdma-ip6routing-base-scale"
       data: "plot-performance-trending-vpp-2n-clx"
@@ -4221,7 +3448,6 @@
         - "Tests.Vpp.Perf.Ip6.2N1L-100Ge2P1Cx556A-Rdma-Ethip6-Ip6Scale2M-Mrr.78B-8t4c-rdma-ethip6-ip6scale2m-mrr"
       layout: "plot-cpta"
 
->>>>>>> CHANGE (b51708 Trending: Plots)
     - title: "2n-dnv-x553-78b-1t1c-ip6-base-scale-ixgbe"
       output-file-name: "2n-dnv-x553-78b-1t1c-ip6-base-scale-ixgbe"
       data: "plot-performance-trending-vpp-2n-dnv"
@@ -5035,8 +4261,6 @@
         - "Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-mrr.64B-8t4c-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-<<<<<<< HEAD   (d3ea22 Report: Add data)
-=======
     - title: "2n-clx-cx556a-64b-2t1c-rdma-l2switching-base"
       output-file-name: "2n-clx-cx556a-64b-2t1c-rdma-l2switching-base"
       data: "plot-performance-trending-vpp-2n-clx"
@@ -5103,40 +4327,6 @@
         - "Tests.Vpp.Perf.L2.2N1L-100Ge2P1Cx556A-Rdma-Eth-L2Bdscale1Mmaclrn-Mrr.64B-8t4c-rdma-eth-l2bdscale1mmaclrn-mrr"
       layout: "plot-cpta"
 
-<<<<<<< HEAD   (914f8e Report: Add 2n-skx Soak and Reconf tests)
->>>>>>> CHANGE (b51708 Trending: Plots)
-    - title: "2n-dnv-x553-64b-1t1c-l2switching-base-ixgbe"
-      output-file-name: "2n-dnv-x553-64b-1t1c-l2-base-ixgbe"
-      data: "plot-performance-trending-vpp-2n-dnv"
-      include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Xcbase-mrr.64B-1t1c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Xcbase-mrr.64B-1t1c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Bdbasemaclrn-mrr.64B-1t1c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdbasemaclrn-mrr.64B-1t1c-eth-l2bdbasemaclrn-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-dnv-x553-64b-2t2c-l2switching-base-ixgbe"
-      output-file-name: "2n-dnv-x553-64b-2t2c-l2-base-ixgbe"
-      data: "plot-performance-trending-vpp-2n-dnv"
-      include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Xcbase-mrr.64B-2t2c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Xcbase-mrr.64B-2t2c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Bdbasemaclrn-mrr.64B-2t2c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdbasemaclrn-mrr.64B-2t2c-eth-l2bdbasemaclrn-mrr"
-      layout: "plot-cpta"
-
-    - title: "2n-dnv-x553-64b-4t4c-l2switching-base-ixgbe"
-      output-file-name: "2n-dnv-x553-64b-4t4c-l2-base-ixgbe"
-      data: "plot-performance-trending-vpp-2n-dnv"
-      include:
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Xcbase-mrr.64B-4t4c-dot1q-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Xcbase-mrr.64B-4t4c-eth-l2xcbase-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Dot1Q-L2Bdbasemaclrn-mrr.64B-4t4c-dot1q-l2bdbasemaclrn-mrr"
-        - "Tests.Vpp.Perf.L2.2N1L-10Ge2P1X553-Eth-L2Bdbasemaclrn-mrr.64B-4t4c-eth-l2bdbasemaclrn-mrr"
-      layout: "plot-cpta"
-
-=======
->>>>>>> CHANGE (51210b Trending: Update graphs - dnv)
     - title: "2n-dnv-x553-64b-1t1c-l2switching-base-scale-ixgbe"
       output-file-name: "2n-dnv-x553-64b-1t1c-l2-base-scale-ixgbe"
       data: "plot-performance-trending-vpp-2n-dnv"
@@ -5950,10 +5140,6 @@
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Mrr.64B-8t4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-mrr"
       layout: "plot-cpta"
 
-<<<<<<< HEAD   (d3ea22 Report: Add data)
-    - title: "2n-skx-xxv710-64b-2t1c-vhost-base-i40e-testpmd"
-      output-file-name: "2n-skx-xxv710-64b-2t1c-vhost-base-i40e-testpmd"
-=======
     - title: "2n-clx-cx556a-64b-2t1c-rdma-l2-vhost-base"
       output-file-name: "2n-clx-cx556a-64b-2t1c-rdma-l2-vhost-base"
       data: "plot-performance-trending-vpp-2n-clx"
@@ -6112,7 +5298,6 @@
 
     - title: "2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd"
       output-file-name: "2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-testpmd"
->>>>>>> CHANGE (b51708 Trending: Plots)
       data: "plot-performance-trending-vpp-2n-skx"
       include:
         - "Tests.Vpp.Perf.Vm Vhost.2N1L-25Ge2P1Xxv710-Dot1Q-L2Xcbase-Eth-2Vhostvr1024-1Vm-Mrr.64B-2t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-mrr"
@@ -6603,8 +5788,6 @@
         - "tests.dpdk.perf.2n1l-25ge2p1xxv710-ethip4-ip4base-l3fwd-mrr.64b-8t4c-ethip4-ip4base-l3fwd-mrr"
       layout: "plot-cpta"
 
-<<<<<<< HEAD   (d3ea22 Report: Add data)
-=======
     - title: "2n-clx-x710-64b-2t1c-dpdk"
       output-file-name: "2n-clx-x710-64b-2t1c-dpdk"
       data: "plot-performance-trending-dpdk-2n-clx"
@@ -6654,7 +5837,6 @@
       layout: "plot-cpta"
 
 
->>>>>>> CHANGE (b51708 Trending: Plots)
     - title: "3n-hsw-x710-64b-1t1c-dpdk"
       output-file-name: "3n-hsw-x710-64b-1t1c-dpdk"
       data: "plot-performance-trending-dpdk-3n-hsw"