X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fspecification.yaml;h=eaf72c80fabc07676f9e4bddf15face3b2c584ae;hp=6612ff636bfb5bc989f498c07e6ee09e39022cf8;hb=2c6e0991f266b1cc08fe69ab4ff051e11b0c1afc;hpb=0ca4a9ec1a8fc53a679b1c635a6e1b6afae0299d

diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 6612ff636b..eaf72c80fa 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -143,7 +143,6 @@
         - 30  # NDRPDR sel
 
 #    plot-vpp-http-server-performance:
-#      # TODO: Replace with 1904 data
 #      # csit-vpp-perf-verify-1904-3n-hsw:
 #      csit-vpp-perf-verify-1810-3n-hsw:
 #        - 28  # WRK
@@ -158,7 +157,6 @@
 #        - 37  # WRK
 
 #    plot-ligato-throughput-lat-tsa-3n-hsw:
-#      # TODO: Replace with 1904 data
 #      # csit-ligato-perf-verify-1904-3n-hsw:
 #      csit-ligato-perf-verify-1901-3n-hsw:
 #        - 8   # NDRPDR sel
@@ -229,7 +227,6 @@
         - 32  # NDRPDR sel
 
     plot-vpp-soak-2n-skx:
-      # TODO: Add 1904 data
       csit-vpp-perf-verify-1904-2n-skx:
         - 70  # soak
         - 71  # soak
@@ -303,7 +300,6 @@
 
 #    # Denverton:
 #    intel-dnv-vpp:
-#      # TODO: Replace with 1904 data
 #      # intel-dnv-vpp-release-1904:
 #      intel-dnv-vpp-release-1901:
 #        - 1
@@ -372,6 +368,19 @@
         - 32  # NDRPDR full
         - 33  # NDRPDR full
         - 35  # NDRPDR full
+        - 36  # NDRPDR full
+        - 37  # NDRPDR full
+        - 38  # NDRPDR full
+        - 40  # NDRPDR full
+        - 45  # NDRPDR full
+        - 46  # NDRPDR full
+        - 48  # NDRPDR full
+        - 49  # NDRPDR full
+        - 50  # NDRPDR full
+        - 51  # NDRPDR full
+        - 52  # NDRPDR full
+        - 53  # NDRPDR full
+        - 54  # NDRPDR full
 
     vpp-perf-results-3n-skx:
       csit-vpp-perf-verify-1904-3n-skx:
@@ -401,7 +410,7 @@
 
     vpp-func-results-ubuntu:
       csit-vpp-functional-1904-ubuntu1604-virl:
-        - 29
+        - 33
 
     vpp-func-results-centos:
       csit-vpp-functional-1904-centos7-virl:
@@ -409,11 +418,10 @@
 
     vpp-device-results-ubuntu:
       csit-vpp-device-1904-ubuntu1804-1n-skx:
-        - 33
+        - 32
 
 #    # VPP Ligato
 #    ligato-perf-results-3n-hsw:
-#      # TODO: Replace with 1904 data
 #      # csit-ligato-perf-verify-1904-3n-hsw:
 #      csit-ligato-perf-verify-1901-3n-hsw:
 #        - 10  # NDRPDR full
@@ -458,7 +466,6 @@
 #      intel-dnv-vpp-release-1901:
 #        - 1
 #    intel-dnv-vpp-changes-2n-dnv-cmp:
-#      # TODO: Replace with 1904 data
 #      # intel-dnv-vpp-release-1904:
 #      intel-dnv-vpp-release-1901:
 #        - 1
@@ -1349,7 +1356,6 @@
     extract: "robot-plugin/output.xml"
 
   builds:
-#    # TODO: Add 1904 data
 ##    intel-dnv-vpp-release-1904:
 ##      - 1
 #
@@ -1409,6 +1415,19 @@
       - 32  # NDRPDR full
       - 33  # NDRPDR full
       - 35  # NDRPDR full
+      - 36  # NDRPDR full
+      - 37  # NDRPDR full
+      - 38  # NDRPDR full
+      - 40  # NDRPDR full
+      - 45  # NDRPDR full
+      - 46  # NDRPDR full
+      - 48  # NDRPDR full
+      - 49  # NDRPDR full
+      - 50  # NDRPDR full
+      - 51  # NDRPDR full
+      - 52  # NDRPDR full
+      - 53  # NDRPDR full
+      - 54  # NDRPDR full
       - 11  # NDRPDR sel
       - 12  # NDRPDR sel
       - 20  # NDRPDR sel
@@ -1557,7 +1576,6 @@
 #      - 16  # NDRPDR sel
 #      - 17  # NDRPDR sel
 #      - 18  # NDRPDR sel
-#    # TODO: Add 1904 data
 ##    csit-ligato-perf-verify-1904-3n-hsw:
 ##      -
 
@@ -3028,7 +3046,7 @@
     data: "data msg"
   rows: "generated"
   data: "vpp-perf-results-3n-hsw"
-  filter: "not 'CFS_OPT'"
+  filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
   parameters:
   - "name"
   - "parent"
@@ -3104,7 +3122,7 @@
     data: "data conf-history"
   rows: "generated"
   data: "vpp-perf-results-3n-hsw"
-  filter: "not 'CFS_OPT'"
+  filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
   parameters:
   - "parent"
   - "name"
@@ -3180,7 +3198,7 @@
     data: "data show-run"
   rows: "generated"
   data: "vpp-perf-results-3n-hsw"
-  filter: "not 'CFS_OPT'"
+  filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
   parameters:
   - "parent"
   - "name"
@@ -4027,7 +4045,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTR,PERF,VPP,3N,HSW]}"
   data: "vpp-perf-results-3n-hsw"
-  filter: "not 'CFS_OPT'"
+  filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
   parameters:
   - "name"
   - "doc"
@@ -4095,7 +4113,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTC,PERF,VPP,3N,HSW]}"
   data: "vpp-perf-results-3n-hsw"
-  filter: "not 'CFS_OPT'"
+  filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
   parameters:
   - "name"
   - "doc"
@@ -4163,7 +4181,7 @@
   file-header: "\n.. |br| raw:: html\n\n    <br />\n\n\n.. |prein| raw:: html\n\n    <pre>\n\n\n.. |preout| raw:: html\n\n    </pre>\n\n"
   dir-tables: "{DIR[DTO,PERF,VPP,3N,HSW]}"
   data: "vpp-perf-results-3n-hsw"
-  filter: "not 'CFS_OPT'"
+  filter: "not ('CFS_OPT' or ('NIC_Intel-X520-DA2' and 'IPSECHW') or ('NIC_Cisco-VIC-1385' and '9000B'))"
   parameters:
   - "name"
   - "doc"