Merge "deb_dpdk: add new 17.11.x branch"
[ci-management.git] / jjb / csit / csit.yaml
index 7a759b4..3df732c 100644 (file)
     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}'
         - master:
             branch: 'master'
             branch-id: 'oper'
         - master:
             branch: 'master'
             branch-id: 'oper'
+        - '1710':
+            branch: 'rls1710'
+            branch-id: 'oper-rls1710'
     stream:
         - master:
             branch: 'master'
             branch-id: 'oper'
     stream:
         - 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'
         - '1701':
             branch: 'rls1701'
             branch-id: 'oper-rls1701'
@@ -68,6 +65,9 @@
         - '1707':
             branch: 'rls1707'
             branch-id: 'oper-rls1707'
         - '1707':
             branch: 'rls1707'
             branch-id: 'oper-rls1707'
+        - '1710':
+            branch: 'rls1710'
+            branch-id: 'oper-rls1710'
 
 
 - job-template:
 
 
 - job-template:
@@ -96,7 +96,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:
             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:
     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:
             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:
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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"))]'
-
-        - 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.'
-
-    project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
-    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}'
-
-    scm:
-        - git-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            branch: '{branch}'
-
-    wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '600'
-
-    triggers:
-        - timed: '0 4 * * 0'
-
-        - gerrit-trigger-manually-triggered:
-            comment-trigger-value: 'csit-vpp-ref-verify'
-            name: '{project}'
-            branch: '{branch}'
-
-    builders:
-        - shell:
-            !include-raw-escape: jjb/csit/include-raw-csit-vpp-verify-weekly.sh
-
-    publishers:
-        - archive-artifacts:
-            artifacts: 'report.html, log.html, output.xml'
-            latest-only: false
-
-        - robot-report:
-            output-path: ''
-
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-
-- 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.'
-
-    project-type: freestyle
-    node: '{os}-basebuild-4c-4g'
-    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}'
-
-    wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '600'
-
-    triggers:
-        - timed: '0 4 * * 2,6'
-
-        - gerrit-trigger-manually-triggered:
-            comment-trigger-value: 'csit-verify-vpp'
-            name: '{project}'
-            branch: '{branch}'
-
-    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-verify-semiweekly.sh
-
-    publishers:
-        - archive-artifacts:
-            artifacts: 'csit/archive/*.*'
-            latest-only: false
-
-        - robot-report:
-            output-path: 'csit/archive'
-
-        - 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.'
-
-    project-type: freestyle
-    node: centos7-basebuild-4c-4g'
-    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}'
-
-    scm:
-        - git-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            branch: '{branch}'
-
-    wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - 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:
-            !include-raw-escape: jjb/csit/include-raw-csit-vpp-verify-nightly.sh
-
-    publishers:
-        - archive-artifacts:
-            artifacts: 'csit/archive/*.*'
-            latest-only: false
-
-        - robot-report:
-            output-path: 'csit/archive'
-
-        - fdio-infra-shiplogs:
-            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.'
-
-    project-type: freestyle
-    node: 'ubuntu1604-basebuild-4c-4g'
-    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}'
-
-    wrappers:
-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: '1440'
-
-    disabled: true
-
-    triggers:
-        - timed: '0 20 * * 0,2,4'
-
-    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
-
-    publishers:
-        - archive-artifacts:
-            artifacts: 'csit/archive/*.*'
-            latest-only: false
-
-        - 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'
+              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-hw-11.csv'
               series:
               series:
-                  - file: 'csit/output_perf_data.xml'
+                  - 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"))]'
                     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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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'
+              csv-file-name: 'csit-vpp-perf-{stream}-{type}-encap-crypto-hw-12.csv'
               series:
               series:
-                  - file: 'csit/output_perf_data.xml'
+                  - 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"))]'
                     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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-vhost-1.csv'
+              csv-file-name: 'csit-vpp-perf-{stream}-{type}-vhost-1.csv'
               series:
               series:
-                  - file: 'csit/output_perf_data.xml'
+                  - 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"))]'
                     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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-vhost-2.csv'
+              csv-file-name: 'csit-vpp-perf-{stream}-{type}-vhost-2.csv'
               series:
               series:
-                  - file: 'csit/output_perf_data.xml'
+                  - 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"))]'
                     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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-vhost-3.csv'
+              csv-file-name: 'csit-vpp-perf-{stream}-{type}-vhost-3.csv'
               series:
               series:
-                  - file: 'csit/output_perf_data.xml'
+                  - 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"))]'
                     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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-vhost-4.csv'
+              csv-file-name: 'csit-vpp-perf-{stream}-{type}-vhost-4.csv'
               series:
               series:
-                  - file: 'csit/output_perf_data.xml'
+                  - 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"))]'
                     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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-vhost-5.csv'
+              csv-file-name: 'csit-vpp-perf-{stream}-{type}-vhost-5.csv'
               series:
               series:
-                  - file: 'csit/output_perf_data.xml'
+                  - 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"))]'
                     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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-vhost-6.csv'
+              csv-file-name: 'csit-vpp-perf-{stream}-{type}-vhost-6.csv'
               series:
               series:
-                  - file: 'csit/output_perf_data.xml'
+                  - 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"))]'
                     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'
 
+- job-template:
+    name: 'csit-ligato-perf-{stream}-{type}'
+
+    project-type: freestyle
+    node: 'ubuntu1604-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}'
+        - type-parameter:
+            type: '{type}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - gerrit-trigger-manually-triggered:
+            name: '{project}'
+            branch: '{branch}'
+            comment-trigger-value: 'verify-perf-ligato-{type}'
+
+    builders:
+        - shell:
+            !include-raw-escape: jjb/csit/include-raw-csit-ligato-perf-hw.sh
+
+    publishers:
+        - archive-artifacts:
+            artifacts: 'archive/*.*'
+            latest-only: false
+
+        - robot:
+            output-path: archive
+            other-files:
+              - '*.*'
+
+        - 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.'
+
+    project-type: freestyle
+    node: '{os}-basebuild-4c-4g'
+    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}'
+
+    scm:
+        - git-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            branch: '{branch}'
+
+    wrappers:
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - timed: '0 4 * * 0'
+
+        - gerrit-trigger-manually-triggered:
+            comment-trigger-value: 'csit-vpp-ref-verify'
+            name: '{project}'
+            branch: '{branch}'
+
+    builders:
+        - shell:
+            !include-raw-escape: jjb/csit/include-raw-csit-vpp-verify-weekly.sh
+
+    publishers:
+        - archive-artifacts:
+            artifacts: 'report.html, log.html, output.xml'
+            latest-only: false
+
+        - robot-report:
+            output-path: ''
+
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+
+- 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.'
+
+    project-type: freestyle
+    node: '{os}-basebuild-4c-4g'
+    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}'
+
+    wrappers:
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - timed: '0 4 * * 2,6'
+
+        - gerrit-trigger-manually-triggered:
+            comment-trigger-value: 'csit-verify-vpp'
+            name: '{project}'
+            branch: '{branch}'
+
+    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-verify-semiweekly.sh
+
+    publishers:
+        - archive-artifacts:
+            artifacts: 'csit/archive/*.*'
+            latest-only: false
+
+        - robot-report:
+            output-path: 'csit/archive'
+
+        - 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.'
+
+    project-type: freestyle
+    node: centos7-basebuild-4c-4g'
+    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}'
+
+    scm:
+        - git-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            branch: '{branch}'
+
+    wrappers:
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - 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:
+            !include-raw-escape: jjb/csit/include-raw-csit-vpp-verify-nightly.sh
+
+    publishers:
+        - archive-artifacts:
+            artifacts: 'csit/archive/*.*'
+            latest-only: false
+
+        - robot-report:
+            output-path: 'csit/archive'
+
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+
 - job-template:
     name: 'csit-docs-verify-{stream}'
 
 - job-template:
     name: 'csit-docs-verify-{stream}'
 
             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:
             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:
     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:
             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:
             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:
         - timed: 'H H(17-20) * * *'
 
     triggers:
         - timed: 'H H(17-20) * * *'
             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:
         - timed: 'H H(17-20) * * 2,6'
 
     triggers:
         - timed: 'H H(17-20) * * 2,6'
             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:
             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:
         - timed: 'H H(0-2) * * *'
 
     triggers:
         - timed: 'H H(0-2) * * *'
           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
             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:
                     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'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
             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: