Feat!: Upgrade Jenkins-job-builder to 6x

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

diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index 1012332..76c5090 100644 (file)
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -1,5 +1,5 @@
-# Copyright (c) 2022 Cisco and/or its affiliates.
-# Copyright (c) 2019 PANTHEON.tech s.r.o. and/or its affiliates.
+# Copyright (c) 2023 Cisco and/or its affiliates.
+# Copyright (c) 2023 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.
 # You may obtain a copy of the License at:
@@ -26,6 +26,9 @@
             - 2n-clx:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+            - 2n-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
             - 2n-zn2:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
@@ -44,6 +47,15 @@
             - 3n-snr:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+            - 3n-icxd:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 3na-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 3nb-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
       - 'csit-dpdk-perf-mrr-weekly-master-{node-arch}':
           node-arch:
             - 2n-icx:
@@ -52,6 +64,9 @@
             - 2n-clx:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+            - 2n-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
             - 2n-zn2:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
@@ -70,6 +85,15 @@
             - 3n-snr:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+            - 3n-icxd:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 3na-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 3nb-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
           periodicity: '0 0 * * 6'
       - 'csit-trex-perf-verify-{stream}-{node-arch}':
           node-arch:
@@ -79,6 +103,9 @@
             - 2n-icx:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+            - 2n-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
       - 'csit-vpp-perf-verify-{stream}-{node-arch}':
           node-arch:
             - 2n-icx:
@@ -87,6 +114,9 @@
             - 2n-clx:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+            - 2n-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
             - 2n-zn2:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
@@ -105,76 +135,120 @@
             - 3n-snr:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+            - 3n-icxd:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 3na-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 3nb-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
           stream:
             - master:
                 branch: 'master'
                 branch-id: 'oper'
-            - '2210':
-                branch: 'rls2210'
-                branch-id: 'oper-rls2210'
-            - '2302':
-                branch: 'rls2302'
-                branch-id: 'oper-rls2302'
+            - '2402':
+                branch: 'rls2402'
+                branch-id: 'oper-rls2402'
       - 'csit-vpp-perf-mrr-daily-master-{node-arch}':
           node-arch:
             - 2n-icx:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-                periodicity: '30 22 * * 1,4'
+                periodicity: '30 22 * * 0-4'
             - 2n-clx:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-                periodicity: '30 22 * * 1,4'
+                periodicity: '30 22 * * 0-4'
+            - 2n-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+                periodicity: '30 22 * * 0-4'
             - 2n-zn2:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-                periodicity: '30 22 * * 1,4'
+                periodicity: '30 22 * * 0-4'
             - 2n-tx2:
                 os: 'ubuntu2204'
                 executor-arch: 'aarch64'
-                periodicity: '30 22 * * 1,4'
+                periodicity: '30 22 * * 0-4'
             - 3n-icx:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-                periodicity: '30 22 * * 1,4'
+                periodicity: '30 22 * * 0-4'
             - 3n-tsh:
                 os: 'ubuntu2204'
                 executor-arch: 'aarch64'
-                periodicity: '30 22 * * 1,4'
+                periodicity: '30 22 * * 0-4'
             - 3n-alt:
                 os: 'ubuntu2204'
                 executor-arch: 'aarch64'
-                periodicity: '30 22 * * 1,4'
+                periodicity: '30 22 * * 0-4'
             - 3n-snr:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-                periodicity: '30 22 * * 1,4'
+                periodicity: '30 22 * * 0-4'
+            - 3n-icxd:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+                periodicity: '30 22 * * 0-4'
+            - 3na-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+                periodicity: '30 22 * * 0-4'
+            - 3nb-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+                periodicity: '30 22 * * 0-4'
       - 'csit-vpp-perf-hoststack-daily-master-{node-arch}':
           node-arch:
             - 2n-icx:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-                periodicity: '30 22 * * 1,4'
+                periodicity: '30 22 * * 0-4'
+            - 2n-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+                periodicity: '30 22 * * 0-4'
             - 3n-icx:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-                periodicity: '30 22 * * 1,4'
+                periodicity: '30 22 * * 0-4'
+            - 3na-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+                periodicity: '30 22 * * 0-4'
+            - 3nb-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+                periodicity: '30 22 * * 0-4'
       - 'csit-vpp-perf-mrr-weekly-{stream}-{node-arch}':
           node-arch:
             - 2n-icx:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+                periodicity: '0 0 * * 6'
             - 2n-clx:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+                periodicity: '0 0 * * 6'
             - 2n-aws:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+                periodicity: '0 0 * * 1'
+            - 2n-c6in:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+                periodicity: '0 0 * * 1'
+            - 2n-c7gn:
+                os: 'ubuntu2204'
+                executor-arch: 'aarch64'
+                periodicity: '0 0 * * 1'
           stream:
             - master:
                 branch: 'master'
                 branch-id: 'oper'
-          periodicity: '0 0 * * 6'
       - 'csit-trex-perf-ndrpdr-weekly-master-{node-arch}':
           node-arch:
             - 1n-aws:
@@ -185,6 +259,10 @@
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
                 periodicity: '0 0 * * 6'
+            - 2n-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+                periodicity: '0 0 * * 6'
       - 'csit-vpp-perf-ndrpdr-weekly-master-{node-arch}':
           node-arch:
             - 2n-icx:
@@ -193,9 +271,36 @@
             - 2n-clx:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+            - 2n-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 2n-zn2:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 2n-tx2:
+                os: 'ubuntu2204'
+                executor-arch: 'aarch64'
             - 3n-icx:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+            - 3n-tsh:
+                os: 'ubuntu2204'
+                executor-arch: 'aarch64'
+            - 3n-alt:
+                os: 'ubuntu2204'
+                executor-arch: 'aarch64'
+            - 3n-snr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 3n-icxd:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 3na-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 3nb-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
           periodicity: '0 0 * * 6'
       - 'csit-vpp-perf-report-iterative-{stream_report}-{node-arch}':
           node-arch:
@@ -205,6 +310,9 @@
             - 2n-clx:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+            - 2n-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
             - 2n-zn2:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
@@ -223,12 +331,27 @@
             - 2n-aws:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+            - 2n-c6in:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 2n-c7gn:
+                os: 'ubuntu2204'
+                executor-arch: 'aarch64'
             - 3n-aws:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 3n-snr:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+            - 3n-icxd:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 3na-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 3nb-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
       - 'csit-dpdk-perf-report-iterative-{stream_report}-{node-arch}':
           node-arch:
             - 2n-icx:
@@ -237,6 +360,9 @@
             - 2n-clx:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+            - 2n-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
             - 2n-zn2:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
@@ -261,6 +387,15 @@
             - 3n-snr:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+            - 3n-icxd:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 3na-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 3nb-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
       - 'csit-trex-perf-report-iterative-{stream_report}-{node-arch}':
           node-arch:
             - 1n-aws:
@@ -269,6 +404,9 @@
             - 2n-icx:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+            - 2n-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
       - 'csit-vpp-perf-report-coverage-{stream_report}-{node-arch}':
           node-arch:
             - 2n-icx:
@@ -277,6 +415,9 @@
             - 2n-clx:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+            - 2n-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
             - 2n-zn2:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
@@ -295,12 +436,27 @@
             - 2n-aws:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+            - 2n-c6in:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 2n-c7gn:
+                os: 'ubuntu2204'
+                executor-arch: 'aarch64'
             - 3n-aws:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 3n-snr:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+            - 3n-icxd:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 3na-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 3nb-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
       - 'csit-dpdk-perf-report-coverage-{stream_report}-{node-arch}':
           node-arch:
             - 2n-icx:
@@ -309,6 +465,9 @@
             - 2n-clx:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+            - 2n-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
             - 2n-zn2:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
@@ -327,12 +486,27 @@
             - 2n-aws:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+            - 2n-c6in:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 2n-c7gn:
+                os: 'ubuntu2204'
+                executor-arch: 'aarch64'
             - 3n-aws:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 3n-snr:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+            - 3n-icxd:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 3na-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 3nb-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
       - 'csit-trex-perf-report-coverage-{stream_report}-{node-arch}':
           node-arch:
             - 1n-aws:
@@ -341,6 +515,9 @@
             - 2n-icx:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+            - 2n-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
 
     project: 'csit'
     branch: 'master'
@@ -351,19 +528,13 @@
       - master:
           branch: 'master'
           branch-id: 'oper'
-      - '2210':
-          branch: 'rls2210'
-          branch-id: 'oper-rls2210'
-      - '2302':
-          branch: 'rls2302'
-          branch-id: 'oper-rls2302'
+      - '2402':
+          branch: 'rls2402'
+          branch-id: 'oper-rls2402'
     stream_report:
-      - '2210':
-          branch: 'rls2210'
-          branch-id: 'oper-rls2210'
-      - '2302':
-          branch: 'rls2302'
-          branch-id: 'oper-rls2302'
+      - '2402':
+          branch: 'rls2402'
+          branch-id: 'oper-rls2402'
 
     build-artifact-num-to-keep: 10
 
@@ -383,10 +554,6 @@
                   <li>trigger: keyword in comment to csit patch:
                       <b>csit-{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
@@ -415,7 +582,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: true
     latest-only: false
 
@@ -428,7 +595,8 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - gerrit-refspec-parameter
+      - gerrit-refspec-parameter:
+          refspec: '$GERRIT_REFSPEC'
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter:
@@ -478,10 +646,6 @@
               <ul>
                   <li>check vpp perf mrr daily
               </ul>
-          <li>executor
-              <ul>
-                  <li>builder-{os}-prod-{executor-arch}
-              </ul>
           <li>perf test-cases selection
               <ul>
                   <li>all CSIT VPP MRR perf suites
@@ -495,7 +659,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: false
     latest-only: false
 
@@ -543,10 +707,6 @@
               <ul>
                   <li>check vpp perf hoststack daily
               </ul>
-          <li>executor
-              <ul>
-                  <li>builder-{os}-prod-{executor-arch}
-              </ul>
           <li>perf test-cases selection
               <ul>
                   <li>all CSIT VPP HOSTSTACK perf suites
@@ -560,7 +720,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: false
     latest-only: false
 
@@ -608,10 +768,6 @@
               <ul>
                   <li>check vpp perf mrr weekly on {node-arch}
               </ul>
-          <li>executor
-              <ul>
-                  <li>builder-{os}-prod-{executor-arch}
-              </ul>
           <li>perf test-cases selection
               <ul>
                   <li>NF Density CSIT VPP MRR perf suites
@@ -625,7 +781,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: false
     latest-only: false
 
@@ -673,10 +829,6 @@
               <ul>
                   <li>check vpp perf ndrpdr weekly on {node-arch}
               </ul>
-          <li>executor
-              <ul>
-                  <li>builder-{os}-prod-{executor-arch}
-              </ul>
           <li>perf test-cases selection
               <ul>
                   <li>pre-selected CSIT VPP NDRPDR perf suites
@@ -689,7 +841,7 @@
               </ul>
       </ul>
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: false
     latest-only: false
 
@@ -733,10 +885,6 @@
               <ul>
                   <li>check trex perf ndrpdr weekly on {node-arch}
               </ul>
-          <li>executor
-              <ul>
-                  <li>builder-{os}-prod-{executor-arch}
-              </ul>
           <li>perf test-cases selection
               <ul>
                   <li>pre-selected CSIT TREX NDRPDR perf suites
@@ -749,7 +897,7 @@
               </ul>
       </ul>
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: false
     latest-only: false
 
@@ -799,10 +947,6 @@
                   <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
@@ -823,7 +967,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: true
     latest-only: false
 
@@ -836,7 +980,8 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - gerrit-refspec-parameter
+      - gerrit-refspec-parameter:
+          refspec: '$GERRIT_REFSPEC'
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter:
@@ -888,10 +1033,6 @@
                   <li>trigger: keyword in comment to csit patch:
                       <b>csit-dpdk-{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
@@ -915,7 +1056,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: true
     latest-only: false
 
@@ -928,7 +1069,8 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - gerrit-refspec-parameter
+      - gerrit-refspec-parameter:
+          refspec: '$GERRIT_REFSPEC'
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter:
@@ -973,10 +1115,6 @@
               <ul>
                   <li>check dpdk perf mrr weekly
               </ul>
-          <li>executor
-              <ul>
-                  <li>builder-{os}-prod-{executor-arch}
-              </ul>
           <li>perf test-cases selection
               <ul>
                   <li>all CSIT DPDK MRR perf suites
@@ -990,7 +1128,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: false
     latest-only: false
 
@@ -1049,10 +1187,6 @@
                   <li>trigger example:
                       csit-vpp-report-iter-{node-arch}-perftest vpp-00
               </ul>
-          <li>executor
-              <ul>
-                  <li>builder-{os}-prod-{executor-arch}
-              </ul>
           <li>perf test-cases selection
               <ul>
                   <li>test-cases selected by tags defined in
@@ -1069,7 +1203,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: true
     latest-only: false
 
@@ -1082,7 +1216,8 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - gerrit-refspec-parameter
+      - gerrit-refspec-parameter:
+          refspec: '$GERRIT_REFSPEC'
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter:
@@ -1138,10 +1273,6 @@
                   <li>trigger example:
                       csit-dpdk-report-iter-{node-arch}-perftest dpdk-00
               </ul>
-          <li>executor
-              <ul>
-                  <li>builder-{os}-prod-{executor-arch}
-              </ul>
           <li>perf test-cases selection
               <ul>
                   <li>test-cases selected by tags defined in
@@ -1158,7 +1289,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: true
     latest-only: false
 
@@ -1171,7 +1302,8 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - gerrit-refspec-parameter
+      - gerrit-refspec-parameter:
+          refspec: '$GERRIT_REFSPEC'
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter:
@@ -1227,10 +1359,6 @@
                   <li>trigger example:
                       csit-trex-report-iter-{node-arch}-perftest trex-00
               </ul>
-          <li>executor
-              <ul>
-                  <li>builder-{os}-prod-{executor-arch}
-              </ul>
           <li>perf test-cases selection
               <ul>
                   <li>test-cases selected by tags defined in
@@ -1247,7 +1375,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: true
     latest-only: false
 
@@ -1260,7 +1388,8 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - gerrit-refspec-parameter
+      - gerrit-refspec-parameter:
+          refspec: '$GERRIT_REFSPEC'
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter:
@@ -1316,10 +1445,6 @@
                   <li>trigger example:
                       csit-vpp-report-cov-{node-arch}-perftest ip4-00
               </ul>
-          <li>executor
-              <ul>
-                  <li>builder-{os}-prod-{executor-arch}
-              </ul>
           <li>perf test-cases selection
               <ul>
                   <li>test-cases selected by tags defined in
@@ -1336,7 +1461,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: true
     latest-only: false
 
@@ -1349,7 +1474,8 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - gerrit-refspec-parameter
+      - gerrit-refspec-parameter:
+          refspec: '$GERRIT_REFSPEC'
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter:
@@ -1405,10 +1531,6 @@
                   <li>trigger example:
                       csit-dpdk-report-cov-{node-arch}-perftest dpdk-00
               </ul>
-          <li>executor
-              <ul>
-                  <li>builder-{os}-prod-{executor-arch}
-              </ul>
           <li>perf test-cases selection
               <ul>
                   <li>test-cases selected by tags defined in
@@ -1425,7 +1547,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: true
     latest-only: false
 
@@ -1438,7 +1560,8 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - gerrit-refspec-parameter
+      - gerrit-refspec-parameter:
+          refspec: '$GERRIT_REFSPEC'
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter:
@@ -1494,10 +1617,6 @@
                   <li>trigger example:
                       csit-trex-report-cov-{node-arch}-perftest trex-00
               </ul>
-          <li>executor
-              <ul>
-                  <li>builder-{os}-prod-{executor-arch}
-              </ul>
           <li>perf test-cases selection
               <ul>
                   <li>test-cases selected by tags defined in
@@ -1514,7 +1633,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: true
     latest-only: false
 
@@ -1527,7 +1646,8 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
-      - gerrit-refspec-parameter
+      - gerrit-refspec-parameter:
+          refspec: '$GERRIT_REFSPEC'
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter: