Update CSIT Performance Jenkins Jobs

- Increase default timeout value in several jobs. - Remove Nightly Performance Job as it is obsolete now. Change-Id: Ibd159d8c4e3bec33f5369928086946873789e8af Signed-off-by: Peter Mikus <pmikus@cisco.com>
author: Peter Mikus <pmikus@cisco.com> 2017-10-19 08:09:14 +0200
committer: Peter Mikus <pmikus@cisco.com> 2017-10-19 07:31:02 +0000
commit: 7bb6259525d4d4ad2db08ada421409b26e7a8234 (patch)
tree: 35287d2ff9f98d6f9bba3f734b529f855cdfd295
parent: 2c305a9ad447fbda9a664afce66a90190048f689 (diff)
2 files changed, 46 insertions, 1136 deletions
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index ce3228e56..ad2094367 100644
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -26,7 +26,6 @@
         - '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}'
@@ -103,8 +102,10 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-       - fdio-infra-wrappers:
+        - fdio-infra-wrappers:
             build-timeout: '{build-timeout}'
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: 360
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -154,8 +155,10 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: 30
+        - fdio-infra-wrappers:
+            build-timeout: '{build-perf-timeout}'
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: 360
 
     triggers:
         - gerrit-trigger-manually-triggered:
@@ -276,8 +279,10 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: 30
+        - fdio-infra-wrappers:
+            build-timeout: '{build-perf-timeout}'
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: 360
 
     triggers:
         - gerrit-trigger-manually-triggered:
@@ -1264,8 +1269,10 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: 30
+        - fdio-infra-wrappers:
+            build-timeout: '{build-perf-timeout}'
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: 360
 
     triggers:
         - gerrit-trigger-manually-triggered:
@@ -1318,7 +1325,9 @@
 
     wrappers:
         - fdio-infra-wrappers:
-            build-timeout: '600'
+            build-timeout: 600
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: 360
 
     triggers:
         - timed: '0 4 * * 0'
@@ -1365,7 +1374,9 @@
 
     wrappers:
         - fdio-infra-wrappers:
-            build-timeout: '600'
+            build-timeout: 600
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: 360
 
     triggers:
         - timed: '0 4 * * 2,6'
@@ -1449,1120 +1460,6 @@
             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'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-            - title: '78B-4t4c-ethip6*-pdrdisc'
-              group: 'RFC2544: Overlay tunnels with crypto in hardware'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-encap-crypto-hw-12.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="78B" and not(contains(@tags, "VHOST")) and contains(@tags, "ENCAP") and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and (contains(@tags, "VXLAN") or contains(@tags, "VXLANGPE") or contains(@tags, "LISP") or contains(@tags, "LISPGPE") or contains(@tags, "GRE")) and contains(@tags, "IPSECHW") and (contains(@tags, "IPSECTRAN") or contains(@tags, "IPSECTUN"))]'
-
-            - title: '64B-1t1c-*-vhost-*-ndrdisc'
-              group: 'RFC2544: vhost-user'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-vhost-1.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "NDRDISC") and contains(@tags, "1T1C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
-            - title: '64B-2t2c-*-vhost-*-ndrdisc'
-              group: 'RFC2544: vhost-user'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-vhost-2.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
-            - title: '64B-4t4c-*-vhost-*-ndrdisc'
-              group: 'RFC2544: vhost-user'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-vhost-3.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "NDRDISC") and contains(@tags, "4T4C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
-            - title: '64B-1t1c-*-vhost-*-pdrdisc'
-              group: 'RFC2544: vhost-user'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-vhost-4.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "1T1C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
-            - title: '64B-2t2c-*-vhost-*-pdrdisc'
-              group: 'RFC2544: vhost-user'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-vhost-5.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "2T2C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
-            - title: '64B-4t4c-*-vhost-*-pdrdisc'
-              group: 'RFC2544: vhost-user'
-              yaxis: 'Packets Per Second'
-              num-builds: '20'
-              keep-records: True
-              csv-file-name: 'csit-vpp-verify-perf-master-nightly-all-vhost-6.csv'
-              series:
-                  - file: 'csit/output_perf_data.xml'
-                    format: xml
-                    xpath-type: 'nodeset'
-                    xpath: '//*[@framesize="64B" and contains(@tags, "PDRDISC") and not(contains(@tags,"NDRDISC")) and contains(@tags, "4T4C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
-
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-
-- job-template:
     name: 'csit-docs-verify-{stream}'
 
     project-type: freestyle
@@ -2824,8 +1721,10 @@
             branch: '{branch}'
 
     wrappers:
-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: '1440'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-perf-timeout}'
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: 360
 
     triggers:
         - timed: 'H H(17-20) * * *'
@@ -3214,8 +2113,10 @@
             branch: '{branch}'
 
     wrappers:
-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: '1440'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-perf-timeout}'
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: 360
 
     triggers:
         - timed: 'H H(17-20) * * 2,6'
@@ -3616,8 +2517,10 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: '1440'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-perf-timeout}'
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: 360
 
     triggers:
         - gerrit:
@@ -3701,8 +2604,10 @@
             branch: '{branch}'
 
     wrappers:
-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: '1440'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-perf-timeout}'
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: 360
 
     triggers:
         - timed: 'H H(0-2) * * *'
@@ -3789,8 +2694,10 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: '1440'
+        - fdio-infra-wrappers:
+            build-timeout: '{build-perf-timeout}'
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: 360
 
     triggers:
         - gerrit:
@@ -3869,8 +2776,10 @@
             choosing-strategy: 'gerrit'
 
     wrappers:
-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: 30
+        - fdio-infra-wrappers:
+            build-timeout: '{build-perf-timeout}'
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: 360
 
     triggers:
         - gerrit-trigger-manually-triggered:
diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index 81daba436..c1203c8a3 100644
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -9,6 +9,7 @@
     build-artifact-num-to-keep: 5
     # Timeout in minutes
     build-timeout: 360
+    build-perf-timeout: 5760
 
     # fd.io branch defaults
     branch: master
author	Peter Mikus <pmikus@cisco.com>	2017-10-19 08:09:14 +0200
committer	Peter Mikus <pmikus@cisco.com>	2017-10-19 07:31:02 +0000
commit	7bb6259525d4d4ad2db08ada421409b26e7a8234 (patch)
tree	35287d2ff9f98d6f9bba3f734b529f855cdfd295
parent	2c305a9ad447fbda9a664afce66a90190048f689 (diff)