CSIT: Reduce daily jobs cadence for 2106 report data collection

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

diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index 37aa94a..3c5b213 100644 (file)
--- 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,129 +20,264 @@
     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
-            - -3n-tsh:
-                executor: 'ubuntu1804arm-us'
+            - 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-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'
-            - '2005':
-                branch: 'rls2005'
-                branch-id: 'oper-rls2005'
             - '2009':
                 branch: 'rls2009'
                 branch-id: 'oper-rls2009'
-      - '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:
-            - '':
-                periodicity: '0 2,14 * * *'
-            - -2n-clx:
-                periodicity: '0 2,14 * * *'
-            - -2n-skx:
-                periodicity: '0 2,14 * * *'
-            - -2n-dnv:
-                periodicity: '0 2,14 * * *'
-            - -3n-skx:
-                periodicity: '0 2,14 * * *'
-            - -3n-dnv:
-                periodicity: '0 2,14 * * *'
-            - -3n-tsh:
-                executor: 'ubuntu1804arm-us'
-                periodicity: '0 14 * * *'
+            - 2n-clx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+                periodicity: '0 2 * * 1,3,5'
+            - 2n-skx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+                periodicity: '0 2 * * 1,3,5'
+            - 2n-dnv:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+                periodicity: '0 2 * * 1,4'
+            - 2n-zn2:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+                periodicity: '0 2 * * 1,4'
+            - 2n-tx2:
+                os: 'ubuntu2004'
+                executor-arch: 'aarch64'
+                periodicity: '0 2 * * 1,4'
+            - 3n-skx:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+                periodicity: '0 2 * * 1,4'
+            - 3n-dnv:
+                os: 'ubuntu2004'
+                executor-arch: 'x86_64'
+                periodicity: '0 2 * * 1,4'
+            - 3n-tsh:
+                os: 'ubuntu2004'
+                executor-arch: 'aarch64'
+                periodicity: '0 2 * * 4'
       - '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'
           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'
       - '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'
       - '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'
       - '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'
 
     project: 'csit'
-    executor: 'ubuntu1804-us'
     branch: 'master'
     branch-id: 'oper'
     csit-perf-trial-duration: "1.0"
@@ -151,19 +286,22 @@
       - master:
           branch: 'master'
           branch-id: 'oper'
-      - '1908_2':
-          branch: 'rls1908_2'
-          branch-id: 'oper-rls1908_2'
-      - '2005':
-          branch: 'rls2005'
-          branch-id: 'oper-rls2005'
       - '2009':
           branch: 'rls2009'
           branch-id: 'oper-rls2009'
+      - '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:
-      - '2009':
-          branch: 'rls2009'
-          branch-id: 'oper-rls2009'
+      - '2106':
+          branch: 'rls2106'
+          branch-id: 'oper-rls2106'
 
     build-artifact-num-to-keep: 10
 
@@ -185,7 +323,7 @@
               </ul>
           <li>executor
               <ul>
-                  <li>{executor}
+                  <li>builder-{os}-prod-{executor-arch}
               </ul>
           <li>perf test-cases selection
               <ul>
@@ -215,7 +353,7 @@
       </ul>
 
     project-type: freestyle
-    node: '{executor}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
     archive-artifacts: 'archive/*.*'
     latest-only: false
@@ -266,21 +404,23 @@
           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
+          output-path: 'archives'
           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>
@@ -290,7 +430,7 @@
               </ul>
           <li>executor
               <ul>
-                  <li>{executor}
+                  <li>builder-{os}-prod-{executor-arch}
               </ul>
           <li>perf test-cases selection
               <ul>
@@ -305,7 +445,7 @@
       </ul>
 
     project-type: freestyle
-    node: '{executor}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: false
     archive-artifacts: 'csit/archive/*.*'
     latest-only: false
@@ -341,18 +481,20 @@
       - 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'
+          output-path: 'archives'
           other-files:
             - '*.*'
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-vpp-perf-mrr-weekly-{stream}-{node-arch}'
@@ -365,7 +507,7 @@
               </ul>
           <li>executor
               <ul>
-                  <li>{executor}
+                  <li>builder-{os}-prod-{executor-arch}
               </ul>
           <li>perf test-cases selection
               <ul>
@@ -380,7 +522,7 @@
       </ul>
 
     project-type: freestyle
-    node: '{executor}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: false
     archive-artifacts: 'csit/archive/*.*'
     latest-only: false
@@ -416,18 +558,20 @@
       - 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'
+          output-path: 'archives'
           other-files:
             - '*.*'
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-vpp-perf-ndrpdr-weekly-master-{node-arch}'
@@ -440,7 +584,7 @@
               </ul>
           <li>executor
               <ul>
-                  <li>{executor}
+                  <li>builder-{os}-prod-{executor-arch}
               </ul>
           <li>perf test-cases selection
               <ul>
@@ -454,7 +598,7 @@
               </ul>
       </ul>
     project-type: freestyle
-    node: '{executor}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: false
     archive-artifacts: 'csit/archive/*.*'
     latest-only: false
@@ -486,18 +630,20 @@
       - 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'
+          output-path: 'archives'
           other-files:
             - '*.*'
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-dpdk-perf-verify-{stream}-{node-arch}'
@@ -516,7 +662,7 @@
               </ul>
           <li>executor
               <ul>
-                  <li>{executor}
+                  <li>builder-{os}-prod-{executor-arch}
               </ul>
           <li>perf test-cases selection
               <ul>
@@ -541,7 +687,7 @@
       </ul>
 
     project-type: freestyle
-    node: '{executor}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
     archive-artifacts: 'archive/*.*'
     latest-only: false
@@ -584,21 +730,23 @@
           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
+          output-path: 'archives'
           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>
@@ -608,7 +756,7 @@
               </ul>
           <li>executor
               <ul>
-                  <li>{executor}
+                  <li>builder-{os}-prod-{executor-arch}
               </ul>
           <li>perf test-cases selection
               <ul>
@@ -623,7 +771,7 @@
       </ul>
 
     project-type: freestyle
-    node: '{executor}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: false
     archive-artifacts: 'csit/archive/*.*'
     latest-only: false
@@ -659,18 +807,20 @@
       - 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'
+          output-path: 'archives'
           other-files:
             - '*.*'
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-vpp-perf-report-iterative-{stream_report}-{node-arch}'
@@ -694,7 +844,7 @@
               </ul>
           <li>executor
               <ul>
-                  <li>{executor}
+                  <li>builder-{os}-prod-{executor-arch}
               </ul>
           <li>perf test-cases selection
               <ul>
@@ -712,7 +862,7 @@
       </ul>
 
     project-type: freestyle
-    node: '{executor}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
     archive-artifacts: 'archive/*.*'
     latest-only: false
@@ -728,6 +878,9 @@
           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:
@@ -755,18 +908,20 @@
           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
+          output-path: 'archives'
           other-files:
             - '*.*'
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-dpdk-perf-report-iterative-{stream_report}-{node-arch}'
@@ -790,7 +945,7 @@
               </ul>
           <li>executor
               <ul>
-                  <li>{executor}
+                  <li>builder-{os}-prod-{executor-arch}
               </ul>
           <li>perf test-cases selection
               <ul>
@@ -808,7 +963,7 @@
       </ul>
 
     project-type: freestyle
-    node: '{executor}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
     archive-artifacts: 'archive/*.*'
     latest-only: false
@@ -824,6 +979,9 @@
           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:
@@ -851,18 +1009,20 @@
           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
+          output-path: 'archives'
           other-files:
             - '*.*'
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-vpp-perf-report-coverage-{stream_report}-{node-arch}'
@@ -886,7 +1046,7 @@
               </ul>
           <li>executor
               <ul>
-                  <li>{executor}
+                  <li>builder-{os}-prod-{executor-arch}
               </ul>
           <li>perf test-cases selection
               <ul>
@@ -904,7 +1064,7 @@
       </ul>
 
     project-type: freestyle
-    node: '{executor}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
     archive-artifacts: 'archive/*.*'
     latest-only: false
@@ -920,6 +1080,9 @@
           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:
@@ -947,18 +1110,20 @@
           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
+          output-path: 'archives'
           other-files:
             - '*.*'
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish
 
 - job-template:
     name: 'csit-dpdk-perf-report-coverage-{stream_report}-{node-arch}'
@@ -982,7 +1147,7 @@
               </ul>
           <li>executor
               <ul>
-                  <li>{executor}
+                  <li>builder-{os}-prod-{executor-arch}
               </ul>
           <li>perf test-cases selection
               <ul>
@@ -1000,7 +1165,7 @@
       </ul>
 
     project-type: freestyle
-    node: '{executor}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
     archive-artifacts: 'archive/*.*'
     latest-only: false
@@ -1016,6 +1181,9 @@
           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:
@@ -1043,15 +1211,17 @@
           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
+          output-path: 'archives'
           other-files:
             - '*.*'
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - fdio-infra-publish