Merge "POC-verify from manual trigger to patch-submitted"

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

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

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


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

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

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


@@ -15,11 +30,14 @@
         - 'csit-docs-merge-{stream_timed}'
         - 'csit-docs-verify-{stream}'
         - 'csit-report-merge-{stream}'
         - 'csit-docs-merge-{stream_timed}'
         - 'csit-docs-verify-{stream}'
         - 'csit-report-merge-{stream}'

-        - 'csit-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-check-{stream}'

-        - 'csit-vpp-perf-ndrchk-daily-{stream}'
+        - 'csit-vpp-perf-ndrchk-daily-master'

         - 'csit-vpp-perf-verify-{stream}'
         - 'csit-vpp-perf-verify-{stream}'

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

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


@@ -32,9 +50,6 @@
         - master:
             branch: 'master'
             branch-id: 'oper'
         - master:
             branch: 'master'
             branch-id: 'oper'

-        - '1704':
-            branch: 'rls1704'
-            branch-id: 'oper-rls1704'

     stream:
         - master:
             branch: 'master'
     stream:
         - master:
             branch: 'master'


@@ -51,6 +66,9 @@
         - '1704':
             branch: 'rls1704'
             branch-id: 'oper-rls1704'
         - '1704':
             branch: 'rls1704'
             branch-id: 'oper-rls1704'

+        - '1707':
+            branch: 'rls1707'
+            branch-id: 'oper-rls1707'

 
 
 - job-template:
 
 
 - job-template:


@@ -145,11 +163,13 @@
 
     publishers:
         - archive-artifacts:
 
     publishers:
         - archive-artifacts:

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

             latest-only: false
 
             latest-only: false
 

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

 
         - plot:
             - title: '64B-1t1c-eth-l2xcbase-testpmd-ndrdisc'
 
         - plot:
             - title: '64B-1t1c-eth-l2xcbase-testpmd-ndrdisc'


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

-    concurrent: false
+    concurrent: true

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


@@ -265,11 +285,13 @@
 
     publishers:
         - archive-artifacts:
 
     publishers:
         - archive-artifacts:

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

             latest-only: false
 
             latest-only: false
 

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

 
         - plot:
             - title: '64B-1t1c-eth-l2*-ndrdisc'
 
         - plot:
             - title: '64B-1t1c-eth-l2*-ndrdisc'


@@ -1208,6 +1230,61 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 

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

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


@@ -1282,7 +1359,7 @@
 
     wrappers:
         - fdio-infra-wrappers:
 
     wrappers:
         - fdio-infra-wrappers:

-            build-timeout: 480
+            build-timeout: '600'

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


@@ -1310,6 +1387,61 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
         - 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.'
 - 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.'


@@ -1334,6 +1466,8 @@
       - fdio-infra-wrappers-non-activity-timeout:
           build-timeout: '1440'
 
       - fdio-infra-wrappers-non-activity-timeout:
           build-timeout: '1440'
 

+    disabled: true
+

     triggers:
         - timed: '0 20 * * 0,2,4'
 
     triggers:
         - timed: '0 20 * * 0,2,4'
 


@@ -2641,7 +2775,7 @@
             maven-version: 'mvn33-new'
 
 - job-template:
             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
 
     description: |
       Purpose of this job is to validate latest vpp build from corresponding


@@ -2688,7 +2822,7 @@
           build-timeout: '1440'
 
     triggers:
           build-timeout: '1440'
 
     triggers:

-        - timed: 'H H(20-23) * * *'
+        - timed: 'H H(17-20) * * *'

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


@@ -2702,8 +2836,10 @@
             artifacts: 'csit/archive/*.*'
             latest-only: false
 
             artifacts: 'csit/archive/*.*'
             latest-only: false
 

-        - robot-report:
+        - robot:

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

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

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


@@ -2714,9 +2850,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-l2-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-l2-1.csv'

               series:
               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"))]'
                     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"))]'


@@ -2725,9 +2861,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-l2-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-l2-2.csv'

               series:
               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"))]'
                     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"))]'


@@ -2737,9 +2873,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-ipv4-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-ipv4-1.csv'

               series:
               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")]'
                     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")]'


@@ -2748,9 +2884,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-ipv4-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-ipv4-2.csv'

               series:
               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")]'
                     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")]'


@@ -2760,9 +2896,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-ipv6-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-ipv6-1.csv'

               series:
               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")]'
                     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")]'


@@ -2771,9 +2907,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-ipv6-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-ipv6-2.csv'

               series:
               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")]'
                     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")]'


@@ -2783,9 +2919,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-encap-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-1.csv'

               series:
               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"))]'
                     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"))]'


@@ -2794,9 +2930,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-encap-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-2.csv'

               series:
               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"))]'
                     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"))]'


@@ -2805,9 +2941,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-encap-3.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-3.csv'

               series:
               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"))]'
                     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"))]'


@@ -2816,9 +2952,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-encap-4.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-4.csv'

               series:
               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"))]'
                     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"))]'


@@ -2828,9 +2964,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-crypto-sw-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-sw-1.csv'

               series:
               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"))]'
                     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"))]'


@@ -2839,9 +2975,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-crypto-sw-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-sw-2.csv'

               series:
               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"))]'
                     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"))]'


@@ -2850,9 +2986,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-crypto-sw-3.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-sw-3.csv'

               series:
               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"))]'
                     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"))]'


@@ -2861,9 +2997,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-crypto-sw-4.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-sw-4.csv'

               series:
               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"))]'
                     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"))]'


@@ -2873,9 +3009,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-crypto-hw-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-hw-1.csv'

               series:
               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"))]'
                     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"))]'


@@ -2884,9 +3020,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-crypto-hw-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-hw-2.csv'

               series:
               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"))]'
                     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"))]'


@@ -2895,9 +3031,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-crypto-hw-3.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-hw-3.csv'

               series:
               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"))]'
                     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"))]'


@@ -2906,9 +3042,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-crypto-hw-4.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-crypto-hw-4.csv'

               series:
               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"))]'
                     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"))]'


@@ -2918,9 +3054,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-encap-crypto-sw-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-sw-1.csv'

               series:
               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"))]'
                     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"))]'


@@ -2929,9 +3065,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-encap-crypto-sw-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-sw-2.csv'

               series:
               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"))]'
                     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"))]'


@@ -2940,9 +3076,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-encap-crypto-sw-3.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-sw-3.csv'

               series:
               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"))]'
                     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"))]'


@@ -2951,9 +3087,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-encap-crypto-sw-4.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-sw-4.csv'

               series:
               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"))]'
                     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"))]'


@@ -2963,9 +3099,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-encap-crypto-hw-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-hw-1.csv'

               series:
               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"))]'
                     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"))]'


@@ -2974,9 +3110,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-encap-crypto-hw-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-hw-2.csv'

               series:
               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"))]'
                     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"))]'


@@ -2985,9 +3121,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-encap-crypto-hw-3.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-hw-3.csv'

               series:
               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"))]'
                     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"))]'


@@ -2996,9 +3132,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-encap-crypto-hw-4.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-encap-crypto-hw-4.csv'

               series:
               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"))]'
                     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"))]'


@@ -3008,9 +3144,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-vhost-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-vhost-1.csv'

               series:
               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"))]'
                     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"))]'


@@ -3019,15 +3155,15 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-vpp-perf-trend-daily-{stream}-vhost-2.csv'
+              csv-file-name: 'csit-vpp-perf-trend-daily-master-vhost-2.csv'

               series:
               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:
                     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
 
     description: |
       Purpose of this job is to validate latest vpp build from corresponding


@@ -3076,7 +3212,7 @@
           build-timeout: '1440'
 
     triggers:
           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'
 
     builders:
         - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'


@@ -3090,8 +3226,10 @@
             artifacts: 'csit/archive/*.*'
             latest-only: false
 
             artifacts: 'csit/archive/*.*'
             latest-only: false
 

-        - robot-report:
+        - robot:

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

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

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


@@ -3102,9 +3240,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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"))]'
                     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"))]'


@@ -3113,9 +3251,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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"))]'
                     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"))]'


@@ -3125,9 +3263,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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")]'
                     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")]'


@@ -3136,9 +3274,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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")]'
                     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")]'


@@ -3148,9 +3286,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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")]'
                     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")]'


@@ -3159,9 +3297,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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")]'
                     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")]'


@@ -3171,9 +3309,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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"))]'
                     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"))]'


@@ -3182,9 +3320,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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"))]'
                     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"))]'


@@ -3193,9 +3331,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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"))]'
                     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"))]'


@@ -3204,9 +3342,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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"))]'
                     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"))]'


@@ -3216,9 +3354,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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"))]'
                     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"))]'


@@ -3227,9 +3365,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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"))]'
                     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"))]'


@@ -3238,9 +3376,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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"))]'
                     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"))]'


@@ -3249,9 +3387,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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"))]'
                     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"))]'


@@ -3261,9 +3399,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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"))]'
                     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"))]'


@@ -3272,9 +3410,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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"))]'
                     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"))]'


@@ -3283,9 +3421,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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"))]'
                     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"))]'


@@ -3294,9 +3432,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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"))]'
                     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"))]'


@@ -3306,9 +3444,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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"))]'
                     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"))]'


@@ -3317,9 +3455,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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"))]'
                     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"))]'


@@ -3328,9 +3466,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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"))]'
                     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"))]'


@@ -3339,9 +3477,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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"))]'
                     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"))]'


@@ -3351,9 +3489,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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"))]'
                     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"))]'


@@ -3362,9 +3500,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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"))]'
                     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"))]'


@@ -3373,9 +3511,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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"))]'
                     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"))]'


@@ -3384,9 +3522,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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"))]'
                     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"))]'


@@ -3396,23 +3534,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True

-              csv-file-name: 'csit-dev-trending-semi-weekly-{stream}-vhost-1.csv'
+              csv-file-name: 'csit-vpp-perf-trend-semi-weekly-master-vhost-1.csv'

               series:
               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'
-              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"))]'
                     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"))]'


@@ -3421,9 +3545,9 @@
               yaxis: 'Packets Per Second'
               num-builds: '20'
               keep-records: True
               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:
               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"))]'
                     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"))]'


@@ -3517,17 +3641,19 @@
 
     publishers:
         - archive-artifacts:
 
     publishers:
         - archive-artifacts:

-            artifacts: 'csit/archive/*.*'
+            artifacts: 'archive/*.*'

             latest-only: false
 
             latest-only: false
 

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

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

-    name: 'csit-vpp-perf-ndrchk-daily-{stream}'
+    name: 'csit-vpp-perf-ndrchk-daily-master'

 
     description: |
       objective
 
     description: |
       objective


@@ -3573,7 +3699,7 @@
           build-timeout: '1440'
 
     triggers:
           build-timeout: '1440'
 
     triggers:

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

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


@@ -3587,8 +3713,10 @@
             artifacts: 'csit/archive/*.*'
             latest-only: false
 
             artifacts: 'csit/archive/*.*'
             latest-only: false
 

-        - robot-report:
+        - robot:

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

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

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


@@ -3617,6 +3745,7 @@
           perf_verify_lisp - 4Lisp, 6Lisp
           perf_verify_vxlan - Vxlan
           perf_verify_vhost - Vhost
           perf_verify_lisp - 4Lisp, 6Lisp
           perf_verify_vxlan - Vxlan
           perf_verify_vhost - Vhost

+          perf_verify_memif - Memif

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


@@ -3673,6 +3802,8 @@
                     comment-contains-value: 'verify-perf-vxlan'
                 - comment-added-contains-event:
                     comment-contains-value: 'verify-perf-vhost'
                     comment-contains-value: 'verify-perf-vxlan'
                 - comment-added-contains-event:
                     comment-contains-value: 'verify-perf-vhost'

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

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


@@ -3691,11 +3822,173 @@
 
     publishers:
         - archive-artifacts:
 
     publishers:
         - archive-artifacts:

-            artifacts: 'csit/archive/*.*'
+            artifacts: 'archive/*.*'
+            latest-only: false
+
+        - robot:
+            output-path: archive
+            other-files:
+              - '*.*'
+
+        - 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}'
+        - os-parameter:
+            os: 'ubuntu1604'
+        - stream-parameter:
+            stream: '{stream}'
+
+    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_{stream}'
+
+    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:
             latest-only: false
 
         - robot-report:

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

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