Cleanup of CSIT jobs

[ci-management.git] / jjb / csit / csit.yaml

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 0e2a62b..3a2a5df 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -1,3 +1,17 @@
+# Copyright (c) 2017 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+

 - project:
     name: csit
     description: 'CSIT jenkins jobs.'
 - project:
     name: csit
     description: 'CSIT jenkins jobs.'


@@ -8,20 +22,22 @@
     jobs:
         - 'csit-dpdk-perf-{stream}-{type}'
         - 'csit-vpp-perf-{stream}-{type}'
     jobs:
         - 'csit-dpdk-perf-{stream}-{type}'
         - 'csit-vpp-perf-{stream}-{type}'

+        - 'csit-ligato-perf-{stream}-{type}'

         - 'csit-vpp-functional-{stream}-{os}-virl'
         - 'csit-vpp-verify-{stream_timed}-{os}-weekly'
         - 'csit-vpp-verify-{stream_timed}-{os}-semiweekly'
         - 'csit-vpp-functional-{stream}-{os}-virl'
         - 'csit-vpp-verify-{stream_timed}-{os}-weekly'
         - 'csit-vpp-verify-{stream_timed}-{os}-semiweekly'

-        - 'csit-vpp-verify-perf-master-nightly-all'

         - 'csit-docs-merge-{stream_timed}'
         - 'csit-docs-verify-{stream}'
         - 'csit-report-merge-{stream}'
         - 'csit-docs-merge-{stream_timed}'
         - 'csit-docs-verify-{stream}'
         - 'csit-report-merge-{stream}'

+        - 'csit-trending-daily-master'

         - 'csit-vpp-perf-trend-daily-master'
         - 'csit-vpp-perf-trend-semi-weekly-master'
         - 'csit-vpp-perf-check-{stream}'
         - 'csit-vpp-perf-trend-daily-master'
         - 'csit-vpp-perf-trend-semi-weekly-master'
         - 'csit-vpp-perf-check-{stream}'

-        - 'csit-vpp-perf-ndrchk-daily-master'
+        - 'csit-vpp-perf-mrr-daily-master'

         - 'csit-vpp-perf-verify-{stream}'
         - 'csit-nsh_sfc-verify-perf-{stream}'
         - 'csit-nsh_sfc-verify-func-{stream}-{os}-virl'
         - 'csit-vpp-perf-verify-{stream}'
         - 'csit-nsh_sfc-verify-perf-{stream}'
         - 'csit-nsh_sfc-verify-func-{stream}-{os}-virl'

+        - 'csit-tldk-verify-func-{stream}-{os}-virl'

 
     project: 'csit'
     branch: 'master'
 
     project: 'csit'
     branch: 'master'


@@ -29,7 +45,6 @@
     build-artifact-num-to-keep: 10
     type:
         - all
     build-artifact-num-to-keep: 10
     type:
         - all

-        - long

     stream_timed:
         - master:
             branch: 'master'
     stream_timed:
         - master:
             branch: 'master'


@@ -38,18 +53,15 @@
         - master:
             branch: 'master'
             branch-id: 'oper'
         - master:
             branch: 'master'
             branch-id: 'oper'

-        - '1606':
-            branch: 'rls1606'
-            branch-id: 'oper-rls1606'
-        - '1609':
-            branch: 'rls1609'
-            branch-id: 'oper-rls1609'
-        - '1701':
-            branch: 'rls1701'
-            branch-id: 'oper-rls1701'
-        - '1704':
-            branch: 'rls1704'
-            branch-id: 'oper-rls1704'
+        - '1707':
+            branch: 'rls1707'
+            branch-id: 'oper-rls1707'
+        - '1710':
+            branch: 'rls1710'
+            branch-id: 'oper-rls1710'
+        - '1801':
+            branch: 'rls1801'
+            branch-id: 'oper-rls1801'

 
 
 - job-template:
 
 
 - job-template:


@@ -78,7 +90,7 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
             choosing-strategy: 'gerrit'
 
     wrappers:

-       - fdio-infra-wrappers:
+        - fdio-infra-wrappers:

             build-timeout: '{build-timeout}'
 
     triggers:
             build-timeout: '{build-timeout}'
 
     triggers:


@@ -106,7 +118,7 @@
 
     project-type: freestyle
     node: 'ubuntu1604-basebuild-4c-4g'
 
     project-type: freestyle
     node: 'ubuntu1604-basebuild-4c-4g'

-    concurrent: false
+    concurrent: true

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -129,8 +141,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
             choosing-strategy: 'gerrit'
 
     wrappers:

-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: 30
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: '{build-timeout}'

 
     triggers:
         - gerrit-trigger-manually-triggered:
 
     triggers:
         - gerrit-trigger-manually-triggered:


@@ -147,76 +159,10 @@
             artifacts: 'archive/*.*'
             latest-only: false
 
             artifacts: 'archive/*.*'
             latest-only: false
 

-        - robot-report:
-            output-path: 'archive'
-
-        - plot:
-            - title: '64B-1t1c-eth-l2xcbase-testpmd-ndrdisc'
-              group: 'RFC2544: Xconnect'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-dpdk-perf-{stream}-{type}-l2-1.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "DPDK") and contains(@tags, "BASE") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "L2XCFWD")]'
-            - title: '64B-2t2c-eth-l2xcbase-testpmd-ndrdisc'
-              group: 'RFC2544: Xconnect'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-dpdk-perf-{stream}-{type}-l2-2.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "DPDK") and contains(@tags, "BASE") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "L2XCFWD")]'
-            - title: '64B-4t4c-eth-l2xcbase-testpmd-ndrdisc'
-              group: 'RFC2544: Xconnect'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-dpdk-perf-{stream}-{type}-l2-3.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "DPDK") and contains(@tags, "BASE") and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and contains(@tags, "L2XCFWD")]'
-            - title: '64B-1t1c-eth-l2xcbase-testpmd-pdrdisc'
-              group: 'RFC2544: Xconnect'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-dpdk-perf-{stream}-{type}-l2-4.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "DPDK") and contains(@tags, "BASE") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and contains(@tags, "L2XCFWD")]'
-            - title: '64B-2t2c-eth-l2xcbase-testpmd-pdrdisc'
-              group: 'RFC2544: Xconnect'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-dpdk-perf-{stream}-{type}-l2-5.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "DPDK") and contains(@tags, "BASE") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and contains(@tags, "L2XCFWD")]'
-            - title: '64B-4t4c-eth-l2xcbase-testpmd-pdrdisc'
-              group: 'RFC2544: Xconnect'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-dpdk-perf-{stream}-{type}-l2-6.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "DPDK") and contains(@tags, "BASE") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and contains(@tags, "L2XCFWD")]'
+        - robot:
+            output-path: archive
+            other-files:
+              - '*.*'

 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'


@@ -225,7 +171,7 @@
     name: 'csit-vpp-perf-{stream}-{type}'
 
     project-type: freestyle
     name: 'csit-vpp-perf-{stream}-{type}'
 
     project-type: freestyle

-    node: 'ubuntu1604-basebuild-4c-4g'
+    node: 'ubuntu1604-basebuild-8c-32g'

     concurrent: true
 
     logrotate:
     concurrent: true
 
     logrotate:


@@ -249,8 +195,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
             choosing-strategy: 'gerrit'
 
     wrappers:

-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: 30
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: '{build-timeout}'

 
     triggers:
         - gerrit-trigger-manually-triggered:
 
     triggers:
         - gerrit-trigger-manually-triggered:


@@ -267,953 +213,20 @@
             artifacts: 'archive/*.*'
             latest-only: false
 
             artifacts: 'archive/*.*'
             latest-only: false
 

-        - robot-report:
-            output-path: 'archive'
-
-        - plot:
-            - title: '64B-1t1c-eth-l2*-ndrdisc'
-              group: 'RFC2544: Xconnect and Bridge Domain'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-l2-1.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "BASE") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "L2BDMACSTAT") or contains(@tags, "L2BDMACLRN") or contains(@tags, "L2XCFWD"))]'
-            - title: '64B-2t2c-eth-l2*-ndrdisc'
-              group: 'RFC2544: Xconnect and Bridge Domain'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-l2-2.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "BASE") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "L2BDMACSTAT") or contains(@tags, "L2BDMACLRN") or contains(@tags, "L2XCFWD"))]'
-            - title: '64B-4t4c-eth-l2*-ndrdisc'
-              group: 'RFC2544: Xconnect and Bridge Domain'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-l2-3.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "BASE") and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and (contains(@tags, "L2BDMACSTAT") or contains(@tags, "L2BDMACLRN") or contains(@tags, "L2XCFWD"))]'
-            - title: '64B-1t1c-eth-l2*-pdrdisc'
-              group: 'RFC2544: Xconnect and Bridge Domain'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-l2-4.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "BASE") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and (contains(@tags, "L2BDMACSTAT") or contains(@tags, "L2BDMACLRN") or contains(@tags, "L2XCFWD"))]'
-            - title: '64B-2t2c-eth-l2*-pdrdisc'
-              group: 'RFC2544: Xconnect and Bridge Domain'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-l2-5.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "BASE") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and (contains(@tags, "L2BDMACSTAT") or contains(@tags, "L2BDMACLRN") or contains(@tags, "L2XCFWD"))]'
-            - title: '64B-4t4c-eth-l2*-pdrdisc'
-              group: 'RFC2544: Xconnect and Bridge Domain'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-l2-6.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "BASE") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and (contains(@tags, "L2BDMACSTAT") or contains(@tags, "L2BDMACLRN") or contains(@tags, "L2XCFWD"))]'
-
-            - title: '64B-1t1c-ethip4-ip4*-ndrdisc'
-              group: 'RFC2544: IPv4 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-ipv4-1.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IP4FWD")]'
-            - title: '64B-2t2c-ethip4-ip4*-ndrdisc'
-              group: 'RFC2544: IPv4 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-ipv4-2.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IP4FWD")]'
-            - title: '64B-4t4c-ethip4-ip4*-ndrdisc'
-              group: 'RFC2544: IPv4 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-ipv4-3.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and contains(@tags, "IP4FWD")]'
-            - title: '64B-1t1c-ethip4-ip4*-pdrdisc'
-              group: 'RFC2544: IPv4 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-ipv4-4.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and contains(@tags, "IP4FWD")]'
-            - title: '64B-2t2c-ethip4-ip4*-pdrdisc'
-              group: 'RFC2544: IPv4 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-ipv4-5.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and contains(@tags, "IP4FWD")]'
-            - title: '64B-4t4c-ethip4-ip4*-pdrdisc'
-              group: 'RFC2544: IPv4 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-ipv4-6.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and contains(@tags, "IP4FWD")]'
-
-            - title: '78B-1t1c-ethip6-ip6*-ndrdisc'
-              group: 'RFC2544: IPv6 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-ipv6-1.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IP6FWD")]'
-            - title: '78B-2t2c-ethip6-ip6*-ndrdisc'
-              group: 'RFC2544: IPv6 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-ipv6-2.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IP6FWD")]'
-            - title: '78B-4t4c-ethip6-ip6*-ndrdisc'
-              group: 'RFC2544: IPv6 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-ipv6-3.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and contains(@tags, "IP6FWD")]'
-            - title: '78B-1t1c-ethip6-ip6*-pdrdisc'
-              group: 'RFC2544: IPv6 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-ipv6-4.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and contains(@tags, "IP6FWD")]'
-            - title: '78B-2t2c-ethip6-ip6*-pdrdisc'
-              group: 'RFC2544: IPv6 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-ipv6-5.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and contains(@tags, "IP6FWD")]'
-            - title: '78B-4t4c-ethip6-ip6*-pdrdisc'
-              group: 'RFC2544: IPv6 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-ipv6-6.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and contains(@tags, "IP6FWD")]'
-
-            - title: '64B-1t1c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-1.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '64B-2t2c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-2.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '64B-4t4c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-3.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '64B-1t1c-ethip4*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-4.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '64B-2t2c-ethip4*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-5.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '64B-4t4c-ethip4*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-6.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '78B-1t1c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-7.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '78B-2t2c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-8.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '78B-4t4c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-9.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '78B-1t1c-ethip6*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-10.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '78B-2t2c-ethip6*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-11.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '78B-4t4c-ethip6*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-12.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-
-            - title: '64B-1t1c-ethip4*-ndrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-crypto-sw-1.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-2t2c-ethip4*-ndrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-crypto-sw-2.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-4t4c-ethip4*-ndrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-crypto-sw-3.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-1t1c-ethip4*-pdrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-crypto-sw-4.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-2t2c-ethip4*-pdrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-crypto-sw-5.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-4t4c-ethip4*-pdrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-crypto-sw-6.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-1t1c-ethip6*-ndrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-crypto-sw-7.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-2t2c-ethip6*-ndrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-crypto-sw-8.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-4t4c-ethip6*-ndrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-crypto-sw-9.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-1t1c-ethip6*-pdrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-crypto-sw-10.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-2t2c-ethip6*-pdrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-crypto-sw-11.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-4t4c-ethip6*-pdrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-crypto-sw-12.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-
-            - title: '64B-1t1c-ethip4*-ndrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-crypto-hw-1.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-2t2c-ethip4*-ndrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-crypto-hw-2.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-4t4c-ethip4*-ndrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-crypto-hw-3.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-1t1c-ethip4*-pdrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-crypto-hw-4.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-2t2c-ethip4*-pdrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-crypto-hw-5.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-4t4c-ethip4*-pdrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-crypto-hw-6.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-1t1c-ethip6*-ndrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-crypto-hw-7.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-2t2c-ethip6*-ndrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-crypto-hw-8.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-4t4c-ethip6*-ndrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-crypto-hw-9.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-1t1c-ethip6*-pdrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-crypto-hw-10.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-2t2c-ethip6*-pdrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-crypto-hw-11.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-4t4c-ethip6*-pdrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-crypto-hw-12.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-
-            - title: '64B-1t1c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-sw-1.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-2t2c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-sw-2.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-4t4c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-sw-3.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-1t1c-ethip4*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-sw-4.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-2t2c-ethip4*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-sw-5.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-4t4c-ethip4*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-sw-6.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-1t1c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-sw-7.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-2t2c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-sw-8.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-4t4c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-sw-9.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-1t1c-ethip6*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-sw-10.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-2t2c-ethip6*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-sw-11.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-4t4c-ethip6*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-sw-12.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-
-            - title: '64B-1t1c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-hw-1.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-2t2c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-hw-2.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-4t4c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-hw-3.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-1t1c-ethip4*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-hw-4.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-2t2c-ethip4*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-hw-5.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-4t4c-ethip4*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-hw-6.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-1t1c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-hw-7.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-2t2c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-hw-8.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-4t4c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-hw-9.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-1t1c-ethip6*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-hw-10.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-2t2c-ethip6*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-hw-11.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-4t4c-ethip6*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-hw-12.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-
-            - title: '64B-1t1c-*-vhost-*-ndrdisc'
-              group: 'RFC2544: vhost-user'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-vhost-1.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
-            - title: '64B-2t2c-*-vhost-*-ndrdisc'
-              group: 'RFC2544: vhost-user'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-vhost-2.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
-            - title: '64B-4t4c-*-vhost-*-ndrdisc'
-              group: 'RFC2544: vhost-user'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-vhost-3.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
-            - title: '64B-1t1c-*-vhost-*-pdrdisc'
-              group: 'RFC2544: vhost-user'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-vhost-4.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
-            - title: '64B-2t2c-*-vhost-*-pdrdisc'
-              group: 'RFC2544: vhost-user'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-vhost-5.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
-            - title: '64B-4t4c-*-vhost-*-pdrdisc'
-              group: 'RFC2544: vhost-user'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-{stream}-{type}-vhost-6.csv'
-              series:
-                  - file: 'output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
+        - robot:
+            output-path: archive
+            other-files:
+              - '*.*'

 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
 - job-template:
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
 - job-template:

-    name: 'csit-vpp-verify-{stream_timed}-{os}-weekly'
-    description: 'Purpose of this job is to validate CSIT code of corresponding branch against verified vpp build from corresponding branch.'
+    name: 'csit-ligato-perf-{stream}-{type}'

 
     project-type: freestyle
 
     project-type: freestyle

-    node: '{os}-basebuild-4c-4g'
-    concurrent: false
+    node: 'ubuntu1604-basebuild-4c-4g'
+    concurrent: true

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -1226,42 +239,46 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'

+        - type-parameter:
+            type: '{type}'

 
     scm:
 
     scm:

-        - git-scm:
+        - gerrit-trigger-scm:

             credentials-id: 'jenkins-gerrit-credentials'
             credentials-id: 'jenkins-gerrit-credentials'

-            branch: '{branch}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'

 
     wrappers:
 
     wrappers:

-        - fdio-infra-wrappers:
-            build-timeout: '600'
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: '{build-timeout}'

 
     triggers:
 
     triggers:

-        - timed: '0 4 * * 0'
-

         - gerrit-trigger-manually-triggered:
         - gerrit-trigger-manually-triggered:

-            comment-trigger-value: 'csit-vpp-ref-verify'

             name: '{project}'
             branch: '{branch}'
             name: '{project}'
             branch: '{branch}'

+            comment-trigger-value: 'verify-perf-ligato-{type}'

 
     builders:
         - shell:
 
     builders:
         - shell:

-            !include-raw-escape: jjb/csit/include-raw-csit-vpp-verify-weekly.sh
+            !include-raw-escape: jjb/csit/include-raw-csit-ligato-perf-hw.sh

 
     publishers:
         - archive-artifacts:
 
     publishers:
         - archive-artifacts:

-            artifacts: 'report.html, log.html, output.xml'
+            artifacts: 'archive/*.*'

             latest-only: false
 
             latest-only: false
 

-        - robot-report:
-            output-path: ''
+        - robot:
+            output-path: archive
+            other-files:
+              - '*.*'

 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 

+

 - job-template:
 - job-template:

-    name: 'csit-vpp-verify-{stream_timed}-{os}-semiweekly'
-    description: 'Purpose of this job is to validate latest vpp build from corresponding branch stored in nexus against verified CSIT codebase of corresponding branch.'
+    name: 'csit-vpp-verify-{stream_timed}-{os}-weekly'
+    description: 'Purpose of this job is to validate CSIT code of corresponding branch against verified vpp build from corresponding branch.'

 
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'
 
     project-type: freestyle
     node: '{os}-basebuild-4c-4g'


@@ -1279,42 +296,44 @@
         - gerrit-parameter:
             branch: '{branch}'
 
         - gerrit-parameter:
             branch: '{branch}'
 

+    scm:
+        - git-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            branch: '{branch}'
+

     wrappers:
     wrappers:

-        - fdio-infra-wrappers:
-            build-timeout: '600'
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: '{build-timeout}'

 
     triggers:
 
     triggers:

-        - timed: '0 4 * * 2,6'
+        - timed: '0 4 * * 0'

 
         - gerrit-trigger-manually-triggered:
 
         - gerrit-trigger-manually-triggered:

-            comment-trigger-value: 'csit-verify-vpp'
+            comment-trigger-value: 'csit-vpp-ref-verify'

             name: '{project}'
             branch: '{branch}'
 
     builders:
             name: '{project}'
             branch: '{branch}'
 
     builders:

-        - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
-        - inject:
-            properties-file: variables.prop

         - shell:
         - shell:

-            !include-raw-escape: jjb/csit/include-raw-csit-vpp-verify-semiweekly.sh
+            !include-raw-escape: jjb/csit/include-raw-csit-vpp-verify-weekly.sh

 
     publishers:
         - archive-artifacts:
 
     publishers:
         - archive-artifacts:

-            artifacts: 'csit/archive/*.*'
+            artifacts: 'report.html, log.html, output.xml'

             latest-only: false
 
         - robot-report:
             latest-only: false
 
         - robot-report:

-            output-path: 'csit/archive'
+            output-path: ''

 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
 - job-template:
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
 - job-template:

-    name: 'csit-vpp-verify-{stream_timed}-centos7-nightly'
-    description: 'Purpose of this job is to validate latest centos7 vpp build from corresponding branch stored in nexus against verified CSIT codebase of corresponding branch.'
+    name: 'csit-vpp-verify-{stream_timed}-{os}-semiweekly'
+    description: 'Purpose of this job is to validate latest vpp build from corresponding branch stored in nexus against verified CSIT codebase of corresponding branch.'

 
     project-type: freestyle
 
     project-type: freestyle

-    node: centos7-basebuild-4c-4g'
+    node: '{os}-basebuild-4c-4g'

     concurrent: false
 
     logrotate:
     concurrent: false
 
     logrotate:


@@ -1329,20 +348,15 @@
         - gerrit-parameter:
             branch: '{branch}'
 
         - gerrit-parameter:
             branch: '{branch}'
 

-    scm:
-        - git-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            branch: '{branch}'
-

     wrappers:
     wrappers:

-        - fdio-infra-wrappers:
+        - fdio-infra-wrappers-non-activity-timeout:

             build-timeout: '{build-timeout}'
 
     triggers:
             build-timeout: '{build-timeout}'
 
     triggers:

-        - timed: 'H H(3-4) * * *'
+        - timed: '0 4 * * 2,6'

 
         - gerrit-trigger-manually-triggered:
 
         - gerrit-trigger-manually-triggered:

-            comment-trigger-value: 'vpp-verify-func-centos7'
+            comment-trigger-value: 'csit-verify-vpp'

             name: '{project}'
             branch: '{branch}'
 
             name: '{project}'
             branch: '{branch}'
 


@@ -1351,7 +365,7 @@
         - inject:
             properties-file: variables.prop
         - shell:
         - inject:
             properties-file: variables.prop
         - shell:

-            !include-raw-escape: jjb/csit/include-raw-csit-vpp-verify-nightly.sh
+            !include-raw-escape: jjb/csit/include-raw-csit-vpp-verify-semiweekly.sh

 
     publishers:
         - archive-artifacts:
 
     publishers:
         - archive-artifacts:


@@ -1365,11 +379,11 @@
             maven-version: 'mvn33-new'
 
 - job-template:
             maven-version: 'mvn33-new'
 
 - job-template:

-    name: 'csit-vpp-verify-perf-master-nightly-all'
-    description: 'Purpose of this job is to validate latest vpp build from corresponding branch stored in nexus against verified CSIT codebase of corresponding branch.'
+    name: 'csit-vpp-verify-{stream_timed}-centos7-nightly'
+    description: 'Purpose of this job is to validate latest centos7 vpp build from corresponding branch stored in nexus against verified CSIT codebase of corresponding branch.'

 
     project-type: freestyle
 
     project-type: freestyle

-    node: 'ubuntu1604-basebuild-4c-4g'
+    node: centos7-basebuild-4c-4g'

     concurrent: false
 
     logrotate:
     concurrent: false
 
     logrotate:


@@ -1384,21 +398,29 @@
         - gerrit-parameter:
             branch: '{branch}'
 
         - gerrit-parameter:
             branch: '{branch}'
 

-    wrappers:
-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: '1440'
+    scm:
+        - git-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            branch: '{branch}'

 
 

-    disabled: true
+    wrappers:
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'

 
     triggers:
 
     triggers:

-        - timed: '0 20 * * 0,2,4'
+        - timed: 'H H(3-4) * * *'
+
+        - gerrit-trigger-manually-triggered:
+            comment-trigger-value: 'vpp-verify-func-centos7'
+            name: '{project}'
+            branch: '{branch}'

 
     builders:
         - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
         - inject:
             properties-file: variables.prop
         - shell:
 
     builders:
         - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
         - inject:
             properties-file: variables.prop
         - shell:

-            !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-nightly.sh
+            !include-raw-escape: jjb/csit/include-raw-csit-vpp-functional-virl.sh

 
     publishers:
         - archive-artifacts:
 
     publishers:
         - archive-artifacts:


@@ -1408,1073 +430,6 @@
         - robot-report:
             output-path: 'csit/archive'
 
         - robot-report:
             output-path: 'csit/archive'
 

-        - plot:
-            - title: 'RFC2544 binary search with 64B, worker-thread=1, rxq=1, NDR'
-              yaxis: 'Packets Per Second'
-              group: 'RFC2544:NDR'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-master-nightly-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64" and contains(@tags,"NDR") and @workerthreads="1"]'
-            - title: 'RFC2544 binary search with 78B, worker-thread=1, rxq=1, NDR'
-              yaxis: 'Packets Per Second'
-              group: 'RFC2544:NDR'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-master-nightly-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78" and contains(@tags,"NDR") and @workerthreads="1"]'
-            - title: 'RFC2544 binary search with 64B, worker-thread=2, rxq=1, NDR'
-              yaxis: 'Packets Per Second'
-              group: 'RFC2544:NDR'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-master-nightly-3.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64" and contains(@tags,"NDR") and @workerthreads="2"]'
-            - title: 'RFC2544 binary search with 78B, worker-thread=2, rxq=1, NDR'
-              yaxis: 'Packets Per Second'
-              group: 'RFC2544:NDR'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-master-nightly-4.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78" and contains(@tags,"NDR") and @workerthreads="2"]'
-            - title: 'RFC2544 binary search with 64B, worker-thread=4, rxq=2, NDR'
-              yaxis: 'Packets Per Second'
-              group: 'RFC2544:NDR'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-master-nightly-5.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64" and contains(@tags,"NDR") and @workerthreads="4"]'
-            - title: 'RFC2544 binary search with 78B, worker-thread=4, rxq=2, NDR'
-              yaxis: 'Packets Per Second'
-              group: 'RFC2544:NDR'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-master-nightly-6.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78" and contains(@tags,"NDR") and @workerthreads="4"]'
-            - title: 'RFC2544 binary search with 64B, worker-thread=1, rxq=1, PDR=0.5%'
-              yaxis: 'Packets Per Second'
-              group: 'RFC2544:PDR'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-master-nightly-7.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64" and contains(@tags,"PDR") and @workerthreads="1"]'
-            - title: 'RFC2544 binary search with 78B, worker-thread=1, rxq=1, PDR=0.5%'
-              yaxis: 'Packets Per Second'
-              group: 'RFC2544:PDR'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-master-nightly-8.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78" and contains(@tags,"PDR") and @workerthreads="1"]'
-            - title: 'RFC2544 binary search with 64B, worker-thread=2, rxq=1, PDR=0.5%'
-              yaxis: 'Packets Per Second'
-              group: 'RFC2544:PDR'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-master-nightly-9.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64" and contains(@tags,"PDR") and @workerthreads="2"]'
-            - title: 'RFC2544 binary search with 78B, worker-thread=2, rxq=1, PDR=0.5%'
-              yaxis: 'Packets Per Second'
-              group: 'RFC2544:PDR'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-master-nightly-10.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78" and contains(@tags,"PDR") and @workerthreads="2"]'
-            - title: 'RFC2544 binary search with 64B, worker-thread=4, rxq=2, PDR=0.5%'
-              yaxis: 'Packets Per Second'
-              group: 'RFC2544:PDR'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-master-nightly-11.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64" and contains(@tags,"PDR") and @workerthreads="4"]'
-            - title: 'RFC2544 binary search with 78B, worker-thread=4, rxq=2, PDR=0.5%'
-              yaxis: 'Packets Per Second'
-              group: 'RFC2544:PDR'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-master-nightly-12.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78" and contains(@tags,"PDR") and @workerthreads="4"]'
-
-            - title: '64B-1t1c-eth-l2*-ndrdisc'
-              group: 'RFC2544: Xconnect and Bridge Domain'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-l2-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "BASE") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "L2BDMACSTAT") or contains(@tags, "L2BDMACLRN") or contains(@tags, "L2XCFWD"))]'
-            - title: '64B-2t2c-eth-l2*-ndrdisc'
-              group: 'RFC2544: Xconnect and Bridge Domain'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-l2-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "BASE") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "L2BDMACSTAT") or contains(@tags, "L2BDMACLRN") or contains(@tags, "L2XCFWD"))]'
-            - title: '64B-4t4c-eth-l2*-ndrdisc'
-              group: 'RFC2544: Xconnect and Bridge Domain'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-l2-3.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "BASE") and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and (contains(@tags, "L2BDMACSTAT") or contains(@tags, "L2BDMACLRN") or contains(@tags, "L2XCFWD"))]'
-            - title: '64B-1t1c-eth-l2*-pdrdisc'
-              group: 'RFC2544: Xconnect and Bridge Domain'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-l2-4.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "BASE") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and (contains(@tags, "L2BDMACSTAT") or contains(@tags, "L2BDMACLRN") or contains(@tags, "L2XCFWD"))]'
-            - title: '64B-2t2c-eth-l2*-pdrdisc'
-              group: 'RFC2544: Xconnect and Bridge Domain'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-l2-5.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "BASE") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and (contains(@tags, "L2BDMACSTAT") or contains(@tags, "L2BDMACLRN") or contains(@tags, "L2XCFWD"))]'
-            - title: '64B-4t4c-eth-l2*-pdrdisc'
-              group: 'RFC2544: Xconnect and Bridge Domain'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-l2-6.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "BASE") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and (contains(@tags, "L2BDMACSTAT") or contains(@tags, "L2BDMACLRN") or contains(@tags, "L2XCFWD"))]'
-
-            - title: '64B-1t1c-ethip4-ip4*-ndrdisc'
-              group: 'RFC2544: IPv4 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-ipv4-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IP4FWD")]'
-            - title: '64B-2t2c-ethip4-ip4*-ndrdisc'
-              group: 'RFC2544: IPv4 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-ipv4-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IP4FWD")]'
-            - title: '64B-4t4c-ethip4-ip4*-ndrdisc'
-              group: 'RFC2544: IPv4 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-ipv4-3.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and contains(@tags, "IP4FWD")]'
-            - title: '64B-1t1c-ethip4-ip4*-pdrdisc'
-              group: 'RFC2544: IPv4 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-ipv4-4.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and contains(@tags, "IP4FWD")]'
-            - title: '64B-2t2c-ethip4-ip4*-pdrdisc'
-              group: 'RFC2544: IPv4 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-ipv4-5.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and contains(@tags, "IP4FWD")]'
-            - title: '64B-4t4c-ethip4-ip4*-pdrdisc'
-              group: 'RFC2544: IPv4 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-ipv4-6.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and contains(@tags, "IP4FWD")]'
-
-            - title: '78B-1t1c-ethip6-ip6*-ndrdisc'
-              group: 'RFC2544: IPv6 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-ipv6-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IP6FWD")]'
-            - title: '78B-2t2c-ethip6-ip6*-ndrdisc'
-              group: 'RFC2544: IPv6 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-ipv6-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IP6FWD")]'
-            - title: '78B-4t4c-ethip6-ip6*-ndrdisc'
-              group: 'RFC2544: IPv6 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-ipv6-3.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and contains(@tags, "IP6FWD")]'
-            - title: '78B-1t1c-ethip6-ip6*-pdrdisc'
-              group: 'RFC2544: IPv6 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-ipv6-4.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and contains(@tags, "IP6FWD")]'
-            - title: '78B-2t2c-ethip6-ip6*-pdrdisc'
-              group: 'RFC2544: IPv6 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-ipv6-5.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and contains(@tags, "IP6FWD")]'
-            - title: '78B-4t4c-ethip6-ip6*-pdrdisc'
-              group: 'RFC2544: IPv6 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-ipv6-6.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and contains(@tags, "IP6FWD")]'
-
-            - title: '64B-1t1c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '64B-2t2c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '64B-4t4c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-3.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '64B-1t1c-ethip4*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-4.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '64B-2t2c-ethip4*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-5.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '64B-4t4c-ethip4*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-6.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '78B-1t1c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-7.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '78B-2t2c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-8.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '78B-4t4c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-9.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '78B-1t1c-ethip6*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-10.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '78B-2t2c-ethip6*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-11.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '78B-4t4c-ethip6*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-12.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-
-            - title: '64B-1t1c-ethip4*-ndrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-crypto-sw-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-2t2c-ethip4*-ndrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-crypto-sw-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-4t4c-ethip4*-ndrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-crypto-sw-3.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-1t1c-ethip4*-pdrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-crypto-sw-4.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-2t2c-ethip4*-pdrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-crypto-sw-5.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-4t4c-ethip4*-pdrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-crypto-sw-6.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-1t1c-ethip6*-ndrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-crypto-sw-7.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-2t2c-ethip6*-ndrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-crypto-sw-8.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-4t4c-ethip6*-ndrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-crypto-sw-9.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-1t1c-ethip6*-pdrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-crypto-sw-10.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-2t2c-ethip6*-pdrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-crypto-sw-11.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-4t4c-ethip6*-pdrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-crypto-sw-12.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-
-            - title: '64B-1t1c-ethip4*-ndrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-crypto-hw-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-2t2c-ethip4*-ndrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-crypto-hw-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-4t4c-ethip4*-ndrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-crypto-hw-3.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-1t1c-ethip4*-pdrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-crypto-hw-4.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-2t2c-ethip4*-pdrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-crypto-hw-5.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-4t4c-ethip4*-pdrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-crypto-hw-6.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-1t1c-ethip6*-ndrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-crypto-hw-7.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-2t2c-ethip6*-ndrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-crypto-hw-8.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-4t4c-ethip6*-ndrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-crypto-hw-9.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-1t1c-ethip6*-pdrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-crypto-hw-10.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-2t2c-ethip6*-pdrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-crypto-hw-11.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-4t4c-ethip6*-pdrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-crypto-hw-12.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-
-            - title: '64B-1t1c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-crypto-sw-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-2t2c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-crypto-sw-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-4t4c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-crypto-sw-3.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-1t1c-ethip4*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-crypto-sw-4.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-2t2c-ethip4*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-crypto-sw-5.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-4t4c-ethip4*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-crypto-sw-6.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-1t1c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-crypto-sw-7.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-2t2c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-crypto-sw-8.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-4t4c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-crypto-sw-9.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-1t1c-ethip6*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-crypto-sw-10.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-2t2c-ethip6*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-crypto-sw-11.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-4t4c-ethip6*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-crypto-sw-12.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-
-            - title: '64B-1t1c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-crypto-hw-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-2t2c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-crypto-hw-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-4t4c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-crypto-hw-3.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-1t1c-ethip4*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-crypto-hw-4.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-2t2c-ethip4*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-crypto-hw-5.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-4t4c-ethip4*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-crypto-hw-6.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-1t1c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-crypto-hw-7.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-2t2c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-crypto-hw-8.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-4t4c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-crypto-hw-9.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-1t1c-ethip6*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-crypto-hw-10.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-2t2c-ethip6*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-crypto-hw-11.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-4t4c-ethip6*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-crypto-hw-12.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-
-            - title: '64B-1t1c-*-vhost-*-ndrdisc'
-              group: 'RFC2544: vhost-user'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-vhost-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
-            - title: '64B-2t2c-*-vhost-*-ndrdisc'
-              group: 'RFC2544: vhost-user'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-vhost-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
-            - title: '64B-4t4c-*-vhost-*-ndrdisc'
-              group: 'RFC2544: vhost-user'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-vhost-3.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
-            - title: '64B-1t1c-*-vhost-*-pdrdisc'
-              group: 'RFC2544: vhost-user'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-vhost-4.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
-            - title: '64B-2t2c-*-vhost-*-pdrdisc'
-              group: 'RFC2544: vhost-user'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-vhost-5.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
-            - title: '64B-4t4c-*-vhost-*-pdrdisc'
-              group: 'RFC2544: vhost-user'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-vhost-6.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
-

         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 


@@ -2506,10 +461,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
             choosing-strategy: 'gerrit'
 
     wrappers:

-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'

         - fdio-infra-wrappers-non-activity-timeout:
         - fdio-infra-wrappers-non-activity-timeout:

-            build-timeout: 360
+            build-timeout: '{build-timeout}'

 
     triggers:
         - gerrit-trigger-patch-submitted:
 
     triggers:
         - gerrit-trigger-patch-submitted:


@@ -2569,10 +522,8 @@
             choosing-strategy: 'default'
 
     wrappers:
             choosing-strategy: 'default'
 
     wrappers:

-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'

         - fdio-infra-wrappers-non-activity-timeout:
         - fdio-infra-wrappers-non-activity-timeout:

-            build-timeout: 360
+            build-timeout: '{build-timeout}'

 
     triggers:
         - reverse:
 
     triggers:
         - reverse:


@@ -2624,7 +575,7 @@
     name: 'csit-report-merge-{stream}'
 
     project-type: freestyle
     name: 'csit-report-merge-{stream}'
 
     project-type: freestyle

-    node: 'ubuntu1604-basebuild-4c-4g'
+    node: 'ubuntu1604-basebuild-8c-32g'

     concurrent: false
 
     logrotate:
     concurrent: false
 
     logrotate:


@@ -2648,10 +599,8 @@
             choosing-strategy: 'default'
 
     wrappers:
             choosing-strategy: 'default'
 
     wrappers:

-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'

         - fdio-infra-wrappers-non-activity-timeout:
         - fdio-infra-wrappers-non-activity-timeout:

-            build-timeout: 360
+            build-timeout: '{build-timeout}'

 
     triggers:
         - gerrit:
 
     triggers:
         - gerrit:


@@ -2696,6 +645,60 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 

+- job-template:
+    name: 'csit-trending-daily-master'
+
+    project-type: freestyle
+    node: 'ubuntu1604-basebuild-8c-32g'
+    concurrent: false
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - maven-exec:
+            maven-version: 'mvn33-new'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            refspec: ''
+            choosing-strategy: 'default'
+
+    wrappers:
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - reverse:
+            jobs: 'csit-vpp-perf-mrr-daily-master'
+            result: 'success'
+
+    builders:
+        - maven-target:
+            maven-version: 'mvn33-new'
+            goals: '--version'
+            settings: 'csit-settings'
+            settings-type: cfp
+            global-settings: 'global-settings'
+            global-settings-type: cfp
+        - provide-maven-settings:
+            settings-file: 'csit-settings'
+            global-settings-file: 'global-settings'
+        - shell:
+            !include-raw-escape: include-raw-csit-cpta.sh
+
+    publishers:
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+

 - job-template:
     name: 'csit-vpp-perf-trend-daily-master'
 
 - job-template:
     name: 'csit-vpp-perf-trend-daily-master'
 


@@ -2740,11 +743,8 @@
             branch: '{branch}'
 
     wrappers:
             branch: '{branch}'
 
     wrappers:

-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: '1440'
-
-    triggers:
-        - timed: 'H H(17-20) * * *'
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: '{build-timeout}'

 
     builders:
         - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
 
     builders:
         - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'


@@ -2758,330 +758,14 @@
             artifacts: 'csit/archive/*.*'
             latest-only: false
 
             artifacts: 'csit/archive/*.*'
             latest-only: false
 

-        - robot-report:
+        - robot:

             output-path: 'csit/archive'
             output-path: 'csit/archive'

+            other-files:
+              - '*.*'

 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 

-        - plot:
-            - title: '64B-1t1c-eth-l2*-ndrdisc'
-              group: 'RFC2544: Xconnect and Bridge Domain'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-l2-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "BASE") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "L2BDMACSTAT") or contains(@tags, "L2BDMACLRN") or contains(@tags, "L2XCFWD"))]'
-            - title: '64B-2t2c-eth-l2*-ndrdisc'
-              group: 'RFC2544: Xconnect and Bridge Domain'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-l2-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "BASE") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "L2BDMACSTAT") or contains(@tags, "L2BDMACLRN") or contains(@tags, "L2XCFWD"))]'
-
-            - title: '64B-1t1c-ethip4-ip4*-ndrdisc'
-              group: 'RFC2544: IPv4 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-ipv4-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IP4FWD")]'
-            - title: '64B-2t2c-ethip4-ip4*-ndrdisc'
-              group: 'RFC2544: IPv4 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-ipv4-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IP4FWD")]'
-
-            - title: '78B-1t1c-ethip6-ip6*-ndrdisc'
-              group: 'RFC2544: IPv6 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-ipv6-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IP6FWD")]'
-            - title: '78B-2t2c-ethip6-ip6*-ndrdisc'
-              group: 'RFC2544: IPv6 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-ipv6-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IP6FWD")]'
-
-            - title: '64B-1t1c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '64B-2t2c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '78B-1t1c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-3.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '78B-2t2c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-4.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-
-            - title: '64B-1t1c-ethip4*-ndrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-sw-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-2t2c-ethip4*-ndrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-sw-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-1t1c-ethip6*-ndrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-sw-3.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-2t2c-ethip6*-ndrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-sw-4.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-
-            - title: '64B-1t1c-ethip4*-ndrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-hw-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-2t2c-ethip4*-ndrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-hw-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-1t1c-ethip6*-ndrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-hw-3.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-2t2c-ethip6*-ndrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-hw-4.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-
-            - title: '64B-1t1c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-sw-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-2t2c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-sw-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-1t1c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-sw-3.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-2t2c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-sw-4.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-
-            - title: '64B-1t1c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-hw-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-2t2c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-hw-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-1t1c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-hw-3.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-2t2c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-hw-4.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-
-            - title: '64B-1t1c-*-vhost-*-ndrdisc'
-              group: 'RFC2544: vhost-user'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-vhost-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
-            - title: '64B-2t2c-*-vhost-*-ndrdisc'
-              group: 'RFC2544: vhost-user'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-master-vhost-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
-

 - job-template:
     name: 'csit-vpp-perf-trend-semi-weekly-master'
 
 - job-template:
     name: 'csit-vpp-perf-trend-semi-weekly-master'
 


@@ -3128,11 +812,8 @@
             branch: '{branch}'
 
     wrappers:
             branch: '{branch}'
 
     wrappers:

-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: '1440'
-
-    triggers:
-        - timed: 'H H(17-20) * * 2,6'
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: '{build-timeout}'

 
     builders:
         - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
 
     builders:
         - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'


@@ -3146,330 +827,14 @@
             artifacts: 'csit/archive/*.*'
             latest-only: false
 
             artifacts: 'csit/archive/*.*'
             latest-only: false
 

-        - robot-report:
+        - robot:

             output-path: 'csit/archive'
             output-path: 'csit/archive'

+            other-files:
+              - '*.*'

 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 

-        - plot:
-            - title: '64B-1t1c-eth-l2*-ndrdisc'
-              group: 'RFC2544: Xconnect and Bridge Domain'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-l2-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "BASE") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "L2BDMACSTAT") or contains(@tags, "L2BDMACLRN") or contains(@tags, "L2XCFWD"))]'
-            - title: '64B-2t2c-eth-l2*-ndrdisc'
-              group: 'RFC2544: Xconnect and Bridge Domain'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-l2-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "BASE") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "L2BDMACSTAT") or contains(@tags, "L2BDMACLRN") or contains(@tags, "L2XCFWD"))]'
-
-            - title: '64B-1t1c-ethip4-ip4*-ndrdisc'
-              group: 'RFC2544: IPv4 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-ipv4-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IP4FWD")]'
-            - title: '64B-2t2c-ethip4-ip4*-ndrdisc'
-              group: 'RFC2544: IPv4 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-ipv4-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IP4FWD")]'
-
-            - title: '78B-1t1c-ethip6-ip6*-ndrdisc'
-              group: 'RFC2544: IPv6 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-ipv6-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IP6FWD")]'
-            - title: '78B-2t2c-ethip6-ip6*-ndrdisc'
-              group: 'RFC2544: IPv6 base, scale, feature'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-ipv6-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and (contains(@tags, "BASE") or contains(@tags, "SCALE") or contains(@tags, "FEATURE")) and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IP6FWD")]'
-
-            - title: '64B-1t1c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '64B-2t2c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '78B-1t1c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-3.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-            - title: '78B-2t2c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels - LISP, VXLAN, GPE, GRE'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-4.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE"))]'
-
-            - title: '64B-1t1c-ethip4*-ndrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-sw-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-2t2c-ethip4*-ndrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-sw-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-1t1c-ethip6*-ndrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-sw-3.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-2t2c-ethip6*-ndrdisc'
-              group: 'RFC2544: Crypto in software: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-sw-4.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-
-            - title: '64B-1t1c-ethip4*-ndrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-hw-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-2t2c-ethip4*-ndrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-hw-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP4FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-1t1c-ethip6*-ndrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-hw-3.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-2t2c-ethip6*-ndrdisc'
-              group: 'RFC2544: Crypto in hardware: IP4FWD, IP6FWD'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-hw-4.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "IP6FWD") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-
-            - title: '64B-1t1c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-sw-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-2t2c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-sw-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-1t1c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-sw-3.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-2t2c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in software'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-sw-4.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECSW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-
-            - title: '64B-1t1c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-hw-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '64B-2t2c-ethip4*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-hw-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-1t1c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-hw-3.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-2t2c-ethip6*-ndrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-hw-4.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-
-            - title: '64B-1t1c-*-vhost-*-ndrdisc'
-              group: 'RFC2544: vhost-user'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-vhost-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
-            - title: '64B-2t2c-*-vhost-*-ndrdisc'
-              group: 'RFC2544: vhost-user'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-vhost-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
-

 - job-template:
     name: 'csit-vpp-perf-check-{stream}'
 
 - job-template:
     name: 'csit-vpp-perf-check-{stream}'
 


@@ -3489,7 +854,7 @@
           format - keyword, tag_list
               verify-perf-ndrdisc, NDRDISC
               verify-perf-pdrdisc, PDRDISC
           format - keyword, tag_list
               verify-perf-ndrdisc, NDRDISC
               verify-perf-pdrdisc, PDRDISC

-              verify-perf-ndrchk, NDRCHK
+              verify-perf-mrr, MRR

       default tags for vpp startup config and perf test type
           1T1C
               one worker thread, one core
       default tags for vpp startup config and perf test type
           1T1C
               one worker thread, one core


@@ -3507,7 +872,7 @@
 
     project-type: freestyle
     node: 'ubuntu1604-basebuild-4c-4g'
 
     project-type: freestyle
     node: 'ubuntu1604-basebuild-4c-4g'

-    concurrent: false
+    concurrent: true

 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'


@@ -3528,8 +893,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
             choosing-strategy: 'gerrit'
 
     wrappers:

-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: '1440'
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: '{build-timeout}'

 
     triggers:
         - gerrit:
 
     triggers:
         - gerrit:


@@ -3540,7 +905,7 @@
                 - comment-added-contains-event:
                     comment-contains-value: 'verify-perf-pdrdisc'
                 - comment-added-contains-event:
                 - comment-added-contains-event:
                     comment-contains-value: 'verify-perf-pdrdisc'
                 - comment-added-contains-event:

-                    comment-contains-value: 'verify-perf-ndrchk'
+                    comment-contains-value: 'verify-perf-mrr'

             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'


@@ -3562,21 +927,23 @@
             artifacts: 'archive/*.*'
             latest-only: false
 
             artifacts: 'archive/*.*'
             latest-only: false
 

-        - robot-report:
-            output-path: 'archive'
+        - robot:
+            output-path: archive
+            other-files:
+              - '*.*'

 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
 - job-template:
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
 - job-template:

-    name: 'csit-vpp-perf-ndrchk-daily-master'
+    name: 'csit-vpp-perf-mrr-daily-master'

 
     description: |
       objective
 
     description: |
       objective

-          check vpp perf ndr chk daily
+          check vpp perf mrr daily

       job
           name
       job
           name

-              csit-vpp-perf-ndrchk-daily
+              csit-vpp-perf-mrr-daily

           trigger
               daily
       perf test-cases selection
           trigger
               daily
       perf test-cases selection


@@ -3611,26 +978,28 @@
             branch: '{branch}'
 
     wrappers:
             branch: '{branch}'
 
     wrappers:

-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: '1440'
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: '{build-timeout}'

 
     triggers:
 
     triggers:

-        - timed: 'H H(0-2) * * *'
+        - timed: 'H H(21-22) * * *'

 
     builders:
         - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
         - inject:
             properties-file: variables.prop
         - shell:
 
     builders:
         - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
         - inject:
             properties-file: variables.prop
         - shell:

-            !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-ndrchk-daily.sh
+            !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-mrr-daily.sh

 
     publishers:
         - archive-artifacts:
             artifacts: 'csit/archive/*.*'
             latest-only: false
 
 
     publishers:
         - archive-artifacts:
             artifacts: 'csit/archive/*.*'
             latest-only: false
 

-        - robot-report:
+        - robot:

             output-path: 'csit/archive'
             output-path: 'csit/archive'

+            other-files:
+              - '*.*'

 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'


@@ -3659,6 +1028,7 @@
           perf_verify_lisp - 4Lisp, 6Lisp
           perf_verify_vxlan - Vxlan
           perf_verify_vhost - Vhost
           perf_verify_lisp - 4Lisp, 6Lisp
           perf_verify_vxlan - Vxlan
           perf_verify_vhost - Vhost

+          perf_verify_memif - Memif

       default tags for vpp startup config and perf test type
           1T1C
               one worker thread, one core
       default tags for vpp startup config and perf test type
           1T1C
               one worker thread, one core


@@ -3696,8 +1066,8 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
             choosing-strategy: 'gerrit'
 
     wrappers:

-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: '1440'
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: '{build-timeout}'

 
     triggers:
         - gerrit:
 
     triggers:
         - gerrit:


@@ -3715,6 +1085,10 @@
                     comment-contains-value: 'verify-perf-vxlan'
                 - comment-added-contains-event:
                     comment-contains-value: 'verify-perf-vhost'
                     comment-contains-value: 'verify-perf-vxlan'
                 - comment-added-contains-event:
                     comment-contains-value: 'verify-perf-vhost'

+                - comment-added-contains-event:
+                    comment-contains-value: 'verify-perf-memif'
+                - comment-added-contains-event:
+                    comment-contains-value: 'verify-perf-ipsechw'

             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'


@@ -3736,8 +1110,10 @@
             artifacts: 'archive/*.*'
             latest-only: false
 
             artifacts: 'archive/*.*'
             latest-only: false
 

-        - robot-report:
-            output-path: 'archive'
+        - robot:
+            output-path: archive
+            other-files:
+              - '*.*'

 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'


@@ -3760,6 +1136,10 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'

+        - os-parameter:
+            os: 'ubuntu1604'
+        - stream-parameter:
+            stream: '{stream}'

 
     scm:
         - gerrit-trigger-scm:
 
     scm:
         - gerrit-trigger-scm:


@@ -3768,14 +1148,14 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
             choosing-strategy: 'gerrit'
 
     wrappers:

-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: 30
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: '{build-timeout}'

 
     triggers:
         - gerrit-trigger-manually-triggered:
             name: '{project}'
             branch: '{branch}'
 
     triggers:
         - gerrit-trigger-manually-triggered:
             name: '{project}'
             branch: '{branch}'

-            comment-trigger-value: 'csit_nsh_sfc_perf'
+            comment-trigger-value: 'csit_nsh_sfc_perf_{stream}'

 
     builders:
         - shell:
 
     builders:
         - shell:


@@ -3812,6 +1192,8 @@
             branch: '{branch}'
         - os-parameter:
             os: '{os}'
             branch: '{branch}'
         - os-parameter:
             os: '{os}'

+        - stream-parameter:
+            stream: '{stream}'

 
     scm:
         - gerrit-trigger-scm:
 
     scm:
         - gerrit-trigger-scm:


@@ -3827,7 +1209,7 @@
         - gerrit-trigger-manually-triggered:
             name: '{project}'
             branch: '{branch}'
         - gerrit-trigger-manually-triggered:
             name: '{project}'
             branch: '{branch}'

-            comment-trigger-value: 'csit_nsh_sfc_func'
+            comment-trigger-value: 'csit_nsh_sfc_func_{stream}'

 
     builders:
         - shell:
 
     builders:
         - shell:


@@ -3844,6 +1226,58 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 

+- job-template:
+    name: 'csit-tldk-verify-func-{stream}-{os}-virl'
+
+    project-type: freestyle
+    node: '{os}-basebuild-4c-4g'
+    concurrent: true
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - os-parameter:
+            os: '{os}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - gerrit-trigger-manually-triggered:
+            name: '{project}'
+            branch: '{branch}'
+            comment-trigger-value: 'csit_verify_tldk_func'
+
+    builders:
+        - shell:
+            !include-raw-escape: include-raw-csit-tldk-functional-virl.sh
+
+    publishers:
+        - archive-artifacts:
+            artifacts: 'archive/*.*'
+            latest-only: false
+
+        - robot-report:
+            output-path: 'archive'
+
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+

 - parameter:
     name: test-type-parameter
     parameters:
 - parameter:
     name: test-type-parameter
     parameters: