Merge "CSIT-682 Usage of make-verify for vpp-csit-verify jobs"
[ci-management.git] / jjb / csit / csit.yaml
index 1c75d6a..0e2a62b 100644 (file)
         - 'csit-docs-merge-{stream_timed}'
         - 'csit-docs-verify-{stream}'
         - 'csit-report-merge-{stream}'
-        - 'csit-vpp-perf-trend-daily-{stream}'
-        - 'csit-vpp-perf-trend-semi-weekly-{stream}'
+        - 'csit-vpp-perf-trend-daily-master'
+        - 'csit-vpp-perf-trend-semi-weekly-master'
         - 'csit-vpp-perf-check-{stream}'
-        - 'csit-vpp-perf-ndrchk-daily-{stream}'
+        - 'csit-vpp-perf-ndrchk-daily-master'
+        - 'csit-vpp-perf-verify-{stream}'
+        - 'csit-nsh_sfc-verify-perf-{stream}'
+        - 'csit-nsh_sfc-verify-func-{stream}-{os}-virl'
 
     project: 'csit'
     branch: 'master'
@@ -31,9 +34,6 @@
         - master:
             branch: 'master'
             branch-id: 'oper'
-        - '1704':
-            branch: 'rls1704'
-            branch-id: 'oper-rls1704'
     stream:
         - master:
             branch: 'master'
 
     publishers:
         - archive-artifacts:
-            artifacts: 'report.html, log.html, output.xml, output_perf_data.xml'
+            artifacts: 'archive/*.*'
             latest-only: false
 
         - robot-report:
-            output-path: ''
+            output-path: 'archive'
 
         - plot:
             - title: '64B-1t1c-eth-l2xcbase-testpmd-ndrdisc'
 
     project-type: freestyle
     node: 'ubuntu1604-basebuild-4c-4g'
-    concurrent: false
+    concurrent: true
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
 
     publishers:
         - archive-artifacts:
-            artifacts: 'report.html, log.html, output.xml, output_perf_data.xml'
+            artifacts: 'archive/*.*'
             latest-only: false
 
         - robot-report:
-            output-path: ''
+            output-path: 'archive'
 
         - plot:
             - title: '64B-1t1c-eth-l2*-ndrdisc'
 
     wrappers:
         - fdio-infra-wrappers:
-            build-timeout: 480
+            build-timeout: '600'
 
     triggers:
         - timed: '0 4 * * 2,6'
         - 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.'
       - fdio-infra-wrappers-non-activity-timeout:
           build-timeout: '1440'
 
+    disabled: true
+
     triggers:
         - timed: '0 20 * * 0,2,4'
 
             maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-perf-trend-daily-{stream}'
+    name: 'csit-vpp-perf-trend-daily-master'
 
     description: |
       Purpose of this job is to validate latest vpp build from corresponding
           build-timeout: '1440'
 
     triggers:
-        - timed: 'H H(20-23) * * *'
+        - timed: 'H H(17-20) * * *'
 
     builders:
         - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-l2-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-l2-1.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-l2-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-l2-2.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-ipv4-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-ipv4-1.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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")]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-ipv4-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-ipv4-2.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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")]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-ipv6-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-ipv6-1.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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")]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-ipv6-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-ipv6-2.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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")]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-encap-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-1.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-encap-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-2.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-encap-3.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-3.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-encap-4.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-4.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-crypto-sw-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-sw-1.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-crypto-sw-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-sw-2.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-crypto-sw-3.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-sw-3.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-crypto-sw-4.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-sw-4.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-crypto-hw-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-hw-1.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-crypto-hw-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-hw-2.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-crypto-hw-3.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-hw-3.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-crypto-hw-4.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-hw-4.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-encap-crypto-sw-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-sw-1.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-encap-crypto-sw-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-sw-2.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-encap-crypto-sw-3.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-sw-3.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-encap-crypto-sw-4.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-sw-4.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-encap-crypto-hw-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-hw-1.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-encap-crypto-hw-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-hw-2.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-encap-crypto-hw-3.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-hw-3.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-encap-crypto-hw-4.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-hw-4.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-vhost-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-vhost-1.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-vhost-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-vhost-2.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - file: 'csit/output_perf_data.xml'
                     format: xml
                     xpath-type: 'nodeset'
                     xpath: '//*[@framesize="64B" and contains(@tags, "NDRDISC") and contains(@tags, "2T2C") and contains(@tags, "VHOST") and (contains(@tags, "ETH") or contains(@tags, "DOT1Q") or contains(@tags, "VXLAN"))]'
 
 - job-template:
-    name: 'csit-vpp-perf-trend-semi-weekly-{stream}'
+    name: 'csit-vpp-perf-trend-semi-weekly-master'
 
     description: |
       Purpose of this job is to validate latest vpp build from corresponding
           build-timeout: '1440'
 
     triggers:
-        - timed: 'H H(20-23) * * 2,6'
+        - timed: 'H H(17-20) * * 2,6'
 
     builders:
         - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-l2-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-l2-1.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-l2-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-l2-2.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-ipv4-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-ipv4-1.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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")]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-ipv4-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-ipv4-2.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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")]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-ipv6-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-ipv6-1.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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")]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-ipv6-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-ipv6-2.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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")]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-encap-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-1.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-encap-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-2.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-encap-3.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-3.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-encap-4.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-4.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-crypto-sw-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-sw-1.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-crypto-sw-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-sw-2.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-crypto-sw-3.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-sw-3.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-crypto-sw-4.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-sw-4.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-crypto-hw-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-hw-1.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-crypto-hw-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-hw-2.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-crypto-hw-3.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-hw-3.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-crypto-hw-4.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-crypto-hw-4.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-encap-crypto-sw-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-sw-1.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-encap-crypto-sw-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-sw-2.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-encap-crypto-sw-3.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-sw-3.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-encap-crypto-sw-4.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-sw-4.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-encap-crypto-hw-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-hw-1.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-encap-crypto-hw-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-hw-2.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-encap-crypto-hw-3.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-hw-3.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-encap-crypto-hw-4.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-encap-crypto-hw-4.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-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-dev-trending-semi-weekly-{stream}-vhost-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-vhost-1.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"))]'
+                  - 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"))]'
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-vhost-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-vhost-2.csv'
               series:
-                  - file: 'output_perf_data.xml'
+                  - 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"))]'
                 notbuilt: false
 
     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-check.sh
 
     publishers:
         - archive-artifacts:
-            artifacts: 'csit/archive/*.*'
+            artifacts: 'archive/*.*'
             latest-only: false
 
         - robot-report:
-            output-path: 'csit/archive'
+            output-path: 'archive'
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-perf-ndrchk-daily-{stream}'
+    name: 'csit-vpp-perf-ndrchk-daily-master'
 
     description: |
       objective
           build-timeout: '1440'
 
     triggers:
-        - timed: 'H H(2-4) * * *'
+        - timed: 'H H(0-2) * * *'
 
     builders:
         - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
+- job-template:
+    name: 'csit-vpp-perf-verify-{stream}'
+
+    description: |
+      objective
+          perf verify - per csit gerrit patch
+      job
+          name
+              csit-vpp-perf-verify
+          trigger
+              keyword in comment to csit patch
+      perf test-cases selection
+          test-cases selected using trigger keywords paired with tags
+          all test-cases are labelled with CSIT RF topic tags defined in
+          csit/docs/tag_documentation.rst
+      proposed keywords
+          focus on testing specified vpp packet processing path
+          format - keyword - tag_list
+          perf_verify_ip4 - IP4Base, IP4Scale2M
+          perf_verify_ip6 - IP6Base, IP6Scale2M
+          perf_verify_l2 - L2XC, L2BD
+          perf_verify_lisp - 4Lisp, 6Lisp
+          perf_verify_vxlan - Vxlan
+          perf_verify_vhost - Vhost
+      default tags for vpp startup config and perf test type
+          1T1C
+              one worker thread, one core
+          X520
+              x520 Niantic NIC
+          NDRDISC
+              discovery of NDR throughput
+      results
+          jjb verify
+              PASS/FAIL
+          present
+              no
+          analyse
+              no
+    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}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+      - fdio-infra-wrappers-non-activity-timeout:
+          build-timeout: '1440'
+
+    triggers:
+        - gerrit:
+            server-name: 'Primary'
+            trigger-on:
+                - comment-added-contains-event:
+                    comment-contains-value: 'verify-perf-l2'
+                - comment-added-contains-event:
+                    comment-contains-value: 'verify-perf-ip4'
+                - comment-added-contains-event:
+                    comment-contains-value: 'verify-perf-ip6'
+                - comment-added-contains-event:
+                    comment-contains-value: 'verify-perf-lisp'
+                - comment-added-contains-event:
+                    comment-contains-value: 'verify-perf-vxlan'
+                - comment-added-contains-event:
+                    comment-contains-value: 'verify-perf-vhost'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '{project}'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+            skip-vote:
+                successful: false
+                failed: false
+                unstable: false
+                notbuilt: false
+
+    builders:
+        - shell:
+            !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-verify.sh
+
+    publishers:
+        - archive-artifacts:
+            artifacts: 'archive/*.*'
+            latest-only: false
+
+        - robot-report:
+            output-path: 'archive'
+
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+
+- job-template:
+    name: 'csit-nsh_sfc-verify-perf-{stream}'
+
+    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}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+      - fdio-infra-wrappers-non-activity-timeout:
+          build-timeout: 30
+
+    triggers:
+        - gerrit-trigger-manually-triggered:
+            name: '{project}'
+            branch: '{branch}'
+            comment-trigger-value: 'csit_nsh_sfc_perf'
+
+    builders:
+        - shell:
+            !include-raw-escape: jjb/csit/include-raw-csit-nsh_sfc-perf-hw.sh
+
+    publishers:
+        - archive-artifacts:
+            artifacts: 'archive/*.*'
+            latest-only: false
+
+        - robot-report:
+            output-path: 'archive'
+
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+
+- job-template:
+    name: 'csit-nsh_sfc-verify-func-{stream}-{os}-virl'
+
+    project-type: freestyle
+    node: '{os}-basebuild-4c-4g'
+    concurrent: true
+
+    logrotate:
+        daysToKeep: '{build-days-to-keep}'
+        numToKeep: '{build-num-to-keep}'
+        artifactDaysToKeep: '{build-artifact-days-to-keep}'
+        artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - os-parameter:
+            os: '{os}'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: 'jenkins-gerrit-credentials'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - fdio-infra-wrappers:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - gerrit-trigger-manually-triggered:
+            name: '{project}'
+            branch: '{branch}'
+            comment-trigger-value: 'csit_nsh_sfc_func'
+
+    builders:
+        - shell:
+            !include-raw-escape: include-raw-csit-nsh_sfc-functional-virl.sh
+
+    publishers:
+        - archive-artifacts:
+            artifacts: 'archive/*.*'
+            latest-only: false
+
+        - robot-report:
+            output-path: 'archive'
+
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+
 - parameter:
     name: test-type-parameter
     parameters: