X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit-perf.yaml;h=2d1008a46b082c7d899426a772d3b9dcbcb0e9f3;hb=876a58f9a343cfbd1a8c184b2ae56a0ced299cc2;hp=1b43e3ea1a09d812482ac54824ef420324dd77be;hpb=f1662d37532339e59b8b7efe325b66e397bde9f8;p=ci-management.git

diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index 1b43e3ea1..2d1008a46 100644
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Copyright (c) 2019 PANTHEON.tech s.r.o. 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.
@@ -20,148 +20,321 @@
     jobs:
       - 'csit-dpdk-perf-verify-{stream}-{node-arch}':
           node-arch:
-            - 2n-clx
-            - 2n-skx
-            - 2n-dnv
-            - 3n-skx
-            - 3n-hsw
-            - 3n-dnv
+            - 2n-clx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-skx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-dnv:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-zn2:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-tx2:
+                os: 'ubuntu2004'
+                executor-arch: 'aarch64'
+            - 3n-skx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 3n-dnv:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
             - 3n-tsh:
-               executor: 'ubuntu1804arm-us'
-      - 'csit-dpdk-perf-mrr-weekly-master{node-arch}':
+                os: 'ubuntu2004'
+                executor-arch: 'aarch64'
+      - 'csit-dpdk-perf-mrr-weekly-master-{node-arch}':
           node-arch:
-            - ''
-            - -2n-clx
-            - -2n-skx
-            - -3n-skx
+            - 2n-clx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-skx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-zn2:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-tx2:
+                os: 'ubuntu2004'
+                executor-arch: 'aarch64'
+            - 3n-skx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 3n-tsh:
+                os: 'ubuntu2004'
+                executor-arch: 'aarch64'
           periodicity: '0 0 * * 6'
+      - 'csit-trex-perf-verify-{stream}-{node-arch}':
+          node-arch:
+            - 2n-skx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 3n-skx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
       - 'csit-vpp-perf-verify-{stream}-{node-arch}':
           node-arch:
-            - 2n-clx
-            - 2n-skx
-            - 2n-dnv
-            - 3n-skx
-            - 3n-hsw
-            - 3n-dnv
+            - 2n-clx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-skx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-dnv:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-zn2:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-tx2:
+                os: 'ubuntu2004'
+                executor-arch: 'aarch64'
+            - 3n-skx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 3n-dnv:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
             - 3n-tsh:
-               executor: 'ubuntu1804arm-us'
+                os: 'ubuntu2004'
+                executor-arch: 'aarch64'
           stream:
             - master:
                 branch: 'master'
                 branch-id: 'oper'
-            - '1908_1':
-                branch: 'rls1908_1'
-                branch-id: 'oper-rls1908_1'
-            - '1908_2':
-                branch: 'rls1908_2'
-                branch-id: 'oper-rls1908_2'
-            - '2001':
-                branch: 'rls2001'
-                branch-id: 'oper-rls2001'
-            - '2005':
-                branch: 'rls2005'
-                branch-id: 'oper-rls2005'
-      - 'csit-vpp-perf-mrr-daily-master{node-arch}':
+            - '2009_lts':
+                branch: 'rls2009_lts'
+                branch-id: 'oper-rls2009_lts'
+            - '2101':
+                branch: 'rls2101'
+                branch-id: 'oper-rls2101'
+            - '2106':
+                branch: 'rls2106'
+                branch-id: 'oper-rls2106'
+      - 'csit-vpp-perf-mrr-daily-master-{node-arch}':
           node-arch:
-            - '':
+            - 2n-clx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
                 periodicity: '0 2,14 * * *'
-            - -2n-clx:
+            - 2n-skx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
                 periodicity: '0 2,14 * * *'
-            - -2n-skx:
+            - 2n-dnv:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
                 periodicity: '0 2,14 * * *'
-            - -2n-dnv:
+            - 2n-zn2:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
                 periodicity: '0 2,14 * * *'
-            - -3n-skx:
+            - 2n-tx2:
+                os: 'ubuntu2004'
+                executor-arch: 'aarch64'
+                periodicity: '0 14 * * *'
+            - 3n-skx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
                 periodicity: '0 2,14 * * *'
-            - -3n-dnv:
+            - 3n-dnv:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
                 periodicity: '0 2,14 * * *'
-            - -3n-tsh:
-                executor: 'ubuntu1804arm-us'
+            - 3n-tsh:
+                os: 'ubuntu2004'
+                executor-arch: 'aarch64'
                 periodicity: '0 14 * * *'
       - 'csit-vpp-perf-mrr-weekly-{stream}-{node-arch}':
           node-arch:
-            - 2n-clx
-            - 2n-skx
-            - 3n-skx
+            - 2n-clx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-skx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 3n-skx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-aws:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 3n-aws:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
           stream:
             - master:
                 branch: 'master'
                 branch-id: 'oper'
-            - '1908_2':
-                branch: 'rls1908_2'
-                branch-id: 'oper-rls1908_2'
+            - '2009_lts':
+                branch: 'rls2009_lts'
+                branch-id: 'oper-rls2009_lts'
           periodicity: '0 0 * * 6'
       - 'csit-vpp-perf-ndrpdr-weekly-master-{node-arch}':
           node-arch:
-            - 2n-clx
-            - 2n-skx
-            - 3n-skx
-            - 3n-hsw
+            - 2n-clx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-skx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 3n-skx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
           periodicity: '0 0 * * 6'
       - 'csit-vpp-perf-report-iterative-{stream_report}-{node-arch}':
           node-arch:
-            - 2n-clx
-            - 2n-skx
-            - 2n-dnv
-            - 3n-skx
-            - 3n-hsw
-            - 3n-dnv
+            - 2n-clx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-skx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-dnv:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-zn2:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-tx2:
+                os: 'ubuntu2004'
+                executor-arch: 'aarch64'
+            - 3n-skx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 3n-dnv:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
             - 3n-tsh:
-                executor: 'ubuntu1804arm-us'
+                os: 'ubuntu2004'
+                executor-arch: 'aarch64'
+            - 2n-aws:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 3n-aws:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
       - 'csit-dpdk-perf-report-iterative-{stream_report}-{node-arch}':
           node-arch:
-            - 2n-clx
-            - 2n-skx
-            - 2n-dnv
-            - 3n-skx
-            - 3n-hsw
-            - 3n-dnv
+            - 2n-clx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-skx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-dnv:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-zn2:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-tx2:
+                os: 'ubuntu2004'
+                executor-arch: 'aarch64'
+            - 3n-skx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 3n-dnv:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
             - 3n-tsh:
-                executor: 'ubuntu1804arm-us'
+                os: 'ubuntu2004'
+                executor-arch: 'aarch64'
+            - 2n-aws:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 3n-aws:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
       - 'csit-vpp-perf-report-coverage-{stream_report}-{node-arch}':
           node-arch:
-            - 2n-clx
-            - 2n-skx
-            - 2n-dnv
-            - 3n-skx
-            - 3n-hsw
-            - 3n-dnv
+            - 2n-clx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-skx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-dnv:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-zn2:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-tx2:
+                os: 'ubuntu2004'
+                executor-arch: 'aarch64'
+            - 3n-skx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 3n-dnv:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
             - 3n-tsh:
-                executor: 'ubuntu1804arm-us'
+                os: 'ubuntu2004'
+                executor-arch: 'aarch64'
+            - 2n-aws:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 3n-aws:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
       - 'csit-dpdk-perf-report-coverage-{stream_report}-{node-arch}':
           node-arch:
-            - 2n-clx
-            - 2n-skx
-            - 2n-dnv
-            - 3n-skx
-            - 3n-hsw
-            - 3n-dnv
+            - 2n-clx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-skx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-dnv:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-zn2:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 2n-tx2:
+                os: 'ubuntu2004'
+                executor-arch: 'aarch64'
+            - 3n-skx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 3n-dnv:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
             - 3n-tsh:
-                executor: 'ubuntu1804arm-us'
+                os: 'ubuntu2004'
+                executor-arch: 'aarch64'
+            - 2n-aws:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+            - 3n-aws:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
 
     project: 'csit'
-    executor: 'ubuntu1804-us'
     branch: 'master'
     branch-id: 'oper'
-    csit-perf-trial-duration: "1.0"
-    csit-perf-trial-multiplicity: "10"
+    csit-perf-trial-duration: '1.0'
+    csit-perf-trial-multiplicity: '10'
     stream:
       - master:
           branch: 'master'
           branch-id: 'oper'
-      - '1908_2':
-          branch: 'rls1908_2'
-          branch-id: 'oper-rls1908_2'
-      - '2001':
-          branch: 'rls2001'
-          branch-id: 'oper-rls2001'
-      - '2005':
-          branch: 'rls2005'
-          branch-id: 'oper-rls2005'
+      - '2009_lts':
+          branch: 'rls2009_lts'
+          branch-id: 'oper-rls2009_lts'
+      - '2101':
+          branch: 'rls2101'
+          branch-id: 'oper-rls2101'
+      - '2106':
+          branch: 'rls2106'
+          branch-id: 'oper-rls2106'
     stream_report:
-      - '2005':
-          branch: 'rls2005'
-          branch-id: 'oper-rls2005'
+      - '2106':
+          branch: 'rls2106'
+          branch-id: 'oper-rls2106'
+
     build-artifact-num-to-keep: 10
 
 
@@ -182,7 +355,7 @@
               </ul>
           <li>executor
               <ul>
-                  <li>{executor}
+                  <li>builder-{os}-prod-{executor-arch}
               </ul>
           <li>perf test-cases selection
               <ul>
@@ -212,9 +385,8 @@
       </ul>
 
     project-type: freestyle
-    node: '{executor}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
-    archive-artifacts: 'archive/*.*'
     latest-only: false
 
     build-discarder:
@@ -235,10 +407,6 @@
           csit-perf-trial-duration: "{csit-perf-trial-duration}"
       - csit-perf-trial-multiplicity-parameter:
           csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
       # This is a manually-triggered verify job, part of API coverage.
       # CRC checking is needed to ensure vpp crc job breaks only when intended.
       # Can be removed when this job is no longer needed for full API coverage.
@@ -263,21 +431,18 @@
           skip-vote: false
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-verify.sh
 
     publishers:
-      - robot:
-          output-path: archive
-          other-files:
-            - '*.*'
-
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
-    name: 'csit-vpp-perf-mrr-daily-master{node-arch}'
+    name: 'csit-vpp-perf-mrr-daily-master-{node-arch}'
 
     description: |
       <ul>
@@ -287,7 +452,7 @@
               </ul>
           <li>executor
               <ul>
-                  <li>{executor}
+                  <li>builder-{os}-prod-{executor-arch}
               </ul>
           <li>perf test-cases selection
               <ul>
@@ -302,9 +467,8 @@
       </ul>
 
     project-type: freestyle
-    node: '{executor}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: false
-    archive-artifacts: 'csit/archive/*.*'
     latest-only: false
 
     build-discarder:
@@ -322,10 +486,6 @@
           csit-perf-trial-duration: "{csit-perf-trial-duration}"
       - csit-perf-trial-multiplicity-parameter:
           csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     wrappers:
       - fdio-infra-wrappers-non-activity-timeout:
@@ -338,18 +498,15 @@
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
       - inject:
           properties-file: variables.prop
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-timed.sh
 
     publishers:
-      - robot:
-          output-path: 'csit/archive'
-          other-files:
-            - '*.*'
-
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-vpp-perf-mrr-weekly-{stream}-{node-arch}'
@@ -362,7 +519,7 @@
               </ul>
           <li>executor
               <ul>
-                  <li>{executor}
+                  <li>builder-{os}-prod-{executor-arch}
               </ul>
           <li>perf test-cases selection
               <ul>
@@ -377,9 +534,8 @@
       </ul>
 
     project-type: freestyle
-    node: '{executor}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: false
-    archive-artifacts: 'csit/archive/*.*'
     latest-only: false
 
     build-discarder:
@@ -397,10 +553,6 @@
           csit-perf-trial-duration: "{csit-perf-trial-duration}"
       - csit-perf-trial-multiplicity-parameter:
           csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     wrappers:
       - fdio-infra-wrappers-non-activity-timeout:
@@ -413,18 +565,15 @@
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
       - inject:
           properties-file: variables.prop
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-timed.sh
 
     publishers:
-      - robot:
-          output-path: 'csit/archive'
-          other-files:
-            - '*.*'
-
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-vpp-perf-ndrpdr-weekly-master-{node-arch}'
@@ -437,7 +586,7 @@
               </ul>
           <li>executor
               <ul>
-                  <li>{executor}
+                  <li>builder-{os}-prod-{executor-arch}
               </ul>
           <li>perf test-cases selection
               <ul>
@@ -451,9 +600,8 @@
               </ul>
       </ul>
     project-type: freestyle
-    node: '{executor}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: false
-    archive-artifacts: 'csit/archive/*.*'
     latest-only: false
 
     build-discarder:
@@ -467,10 +615,6 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     wrappers:
       - fdio-infra-wrappers-non-activity-timeout:
@@ -483,18 +627,110 @@
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
       - inject:
           properties-file: variables.prop
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-timed.sh
 
     publishers:
-      - robot:
-          output-path: 'csit/archive'
-          other-files:
-            - '*.*'
+      - fdio-infra-publish
+
+- job-template:
+    name: 'csit-trex-perf-verify-{stream}-{node-arch}'
+
+    description: |
+      <ul>
+          <li>objective
+              <ul>
+                  <li>perf verify - per csit gerrit patch
+              </ul>
+          <li>job
+              <ul>
+                  <li>name: <b>csit-trex-perf-verify-{stream}-{node-arch}</b>
+                  <li>trigger: keyword in comment to csit patch:
+                      <b>csit-trex-{node-arch}-perftest tag_list</b>
+              </ul>
+          <li>executor
+              <ul>
+                  <li>builder-{os}-prod-{executor-arch}
+              </ul>
+          <li>perf test-cases selection
+              <ul>
+                  <li>test-cases selected using trigger keyword followed by tags
+                  <li>all test-cases are labelled with CSIT RF topic tags
+                      defined in <i>csit/docs/tag_documentation.rst</i>
+              </ul>
+          <li>proposed keywords
+              <ul>
+                  <li>focus on testing specified trex packet processing path
+                  <li>format: csit-{node-arch}-perftest tag_list
+              </ul>
+          <li>results
+              <ul>
+                  <li>jjb verify: PASS/FAIL
+                  <li>present: no
+                  <li>analyse: no
+              </ul>
+      </ul>
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+    project-type: freestyle
+    node: 'builder-{os}-prod-{executor-arch}'
+    concurrent: true
+    latest-only: false
+
+    build-discarder:
+      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}'
+      - gerrit-refspec-parameter
+      - gerrit-event-type-parameter
+      - gerrit-event-comment-text-parameter
+      - csit-perf-trial-duration-parameter:
+          csit-perf-trial-duration: "{csit-perf-trial-duration}"
+      - csit-perf-trial-multiplicity-parameter:
+          csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
+      # This is a manually-triggered verify job, part of API coverage.
+      # CRC checking is needed to ensure vpp crc job breaks only when intended.
+      # Can be removed when this job is no longer needed for full API coverage.
+      - csit-fail-on-crc-mismatch-parameter:
+          fail-on-crc-mismatch: 'True'
+
+    scm:
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+
+    wrappers:
+      - fdio-infra-wrappers-non-activity-timeout:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - gerrit-trigger-csit-perftest:
+          project: '{project}'
+          branch: '{branch}'
+          trigger-word: 'csit-trex-{node-arch}-perftest'
+          skip-vote: false
+
+    builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/csit/perf-verify.sh
+
+    publishers:
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-dpdk-perf-verify-{stream}-{node-arch}'
@@ -513,7 +749,7 @@
               </ul>
           <li>executor
               <ul>
-                  <li>{executor}
+                  <li>builder-{os}-prod-{executor-arch}
               </ul>
           <li>perf test-cases selection
               <ul>
@@ -538,9 +774,8 @@
       </ul>
 
     project-type: freestyle
-    node: '{executor}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
-    archive-artifacts: 'archive/*.*'
     latest-only: false
 
     build-discarder:
@@ -558,10 +793,6 @@
           csit-perf-trial-duration: "{csit-perf-trial-duration}"
       - csit-perf-trial-multiplicity-parameter:
           csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -581,21 +812,18 @@
           skip-vote: false
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-verify.sh
 
     publishers:
-      - robot:
-          output-path: archive
-          other-files:
-            - '*.*'
-
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
-    name: 'csit-dpdk-perf-mrr-weekly-master{node-arch}'
+    name: 'csit-dpdk-perf-mrr-weekly-master-{node-arch}'
 
     description: |
       <ul>
@@ -605,7 +833,7 @@
               </ul>
           <li>executor
               <ul>
-                  <li>{executor}
+                  <li>builder-{os}-prod-{executor-arch}
               </ul>
           <li>perf test-cases selection
               <ul>
@@ -620,9 +848,8 @@
       </ul>
 
     project-type: freestyle
-    node: '{executor}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: false
-    archive-artifacts: 'csit/archive/*.*'
     latest-only: false
 
     build-discarder:
@@ -640,10 +867,6 @@
           csit-perf-trial-duration: "{csit-perf-trial-duration}"
       - csit-perf-trial-multiplicity-parameter:
           csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     wrappers:
       - fdio-infra-wrappers-non-activity-timeout:
@@ -656,18 +879,15 @@
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
       - inject:
           properties-file: variables.prop
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-timed.sh
 
     publishers:
-      - robot:
-          output-path: 'csit/archive'
-          other-files:
-            - '*.*'
-
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-vpp-perf-report-iterative-{stream_report}-{node-arch}'
@@ -691,7 +911,7 @@
               </ul>
           <li>executor
               <ul>
-                  <li>{executor}
+                  <li>builder-{os}-prod-{executor-arch}
               </ul>
           <li>perf test-cases selection
               <ul>
@@ -709,9 +929,8 @@
       </ul>
 
     project-type: freestyle
-    node: '{executor}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
-    archive-artifacts: 'archive/*.*'
     latest-only: false
 
     build-discarder:
@@ -725,14 +944,13 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - gerrit-refspec-parameter
+      - gerrit-event-type-parameter
+      - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter:
           csit-perf-trial-duration: "{csit-perf-trial-duration}"
       - csit-perf-trial-multiplicity-parameter:
           csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -752,18 +970,15 @@
           skip-vote: false
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-verify.sh
 
     publishers:
-      - robot:
-          output-path: archive
-          other-files:
-            - '*.*'
-
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-dpdk-perf-report-iterative-{stream_report}-{node-arch}'
@@ -787,7 +1002,7 @@
               </ul>
           <li>executor
               <ul>
-                  <li>{executor}
+                  <li>builder-{os}-prod-{executor-arch}
               </ul>
           <li>perf test-cases selection
               <ul>
@@ -805,9 +1020,8 @@
       </ul>
 
     project-type: freestyle
-    node: '{executor}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
-    archive-artifacts: 'archive/*.*'
     latest-only: false
 
     build-discarder:
@@ -821,14 +1035,13 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - gerrit-refspec-parameter
+      - gerrit-event-type-parameter
+      - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter:
           csit-perf-trial-duration: "{csit-perf-trial-duration}"
       - csit-perf-trial-multiplicity-parameter:
           csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -848,18 +1061,15 @@
           skip-vote: false
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-verify.sh
 
     publishers:
-      - robot:
-          output-path: archive
-          other-files:
-            - '*.*'
-
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-vpp-perf-report-coverage-{stream_report}-{node-arch}'
@@ -883,7 +1093,7 @@
               </ul>
           <li>executor
               <ul>
-                  <li>{executor}
+                  <li>builder-{os}-prod-{executor-arch}
               </ul>
           <li>perf test-cases selection
               <ul>
@@ -901,9 +1111,8 @@
       </ul>
 
     project-type: freestyle
-    node: '{executor}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
-    archive-artifacts: 'archive/*.*'
     latest-only: false
 
     build-discarder:
@@ -917,14 +1126,13 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - gerrit-refspec-parameter
+      - gerrit-event-type-parameter
+      - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter:
           csit-perf-trial-duration: "{csit-perf-trial-duration}"
       - csit-perf-trial-multiplicity-parameter:
           csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -944,18 +1152,15 @@
           skip-vote: false
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-verify.sh
 
     publishers:
-      - robot:
-          output-path: archive
-          other-files:
-            - '*.*'
-
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-dpdk-perf-report-coverage-{stream_report}-{node-arch}'
@@ -979,7 +1184,7 @@
               </ul>
           <li>executor
               <ul>
-                  <li>{executor}
+                  <li>builder-{os}-prod-{executor-arch}
               </ul>
           <li>perf test-cases selection
               <ul>
@@ -997,9 +1202,8 @@
       </ul>
 
     project-type: freestyle
-    node: '{executor}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
-    archive-artifacts: 'archive/*.*'
     latest-only: false
 
     build-discarder:
@@ -1013,14 +1217,13 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - gerrit-refspec-parameter
+      - gerrit-event-type-parameter
+      - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter:
           csit-perf-trial-duration: "{csit-perf-trial-duration}"
       - csit-perf-trial-multiplicity-parameter:
           csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -1040,15 +1243,12 @@
           skip-vote: false
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-verify.sh
 
     publishers:
-      - robot:
-          output-path: archive
-          other-files:
-            - '*.*'
-
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish