X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit-perf.yaml;h=8f9fdf71ef387248a6c7bf86c6910df0a40bb350;hb=3ef1d97d2cf16083aa8923eb3470f395f24dbb4b;hp=de27ee59d7120c72bc23c6b6750ed51e002b7f75;hpb=45b1144b4fbbbd0f3c95e82d43ba97b73aa22b2c;p=ci-management.git

diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index de27ee59d..8f9fdf71e 100644
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -1,5 +1,5 @@
-# Copyright (c) 2021 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:
@@ -21,364 +21,489 @@
       - 'csit-dpdk-perf-verify-{stream}-{node-arch}':
           node-arch:
             - 2n-icx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-clx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-            - 2n-skx:
-                os: 'ubuntu2004'
-                executor-arch: 'x86_64'
-            - 2n-dnv:
-                os: 'ubuntu2004'
+            - 2n-spr:
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-zn2:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-tx2:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'aarch64'
-            - 3n-skx:
-                os: 'ubuntu2004'
-                executor-arch: 'x86_64'
             - 3n-icx:
-                os: 'ubuntu2004'
-                executor-arch: 'x86_64'
-            - 3n-dnv:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 3n-tsh:
-                os: 'ubuntu2004'
+                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'
       - 'csit-dpdk-perf-mrr-weekly-master-{node-arch}':
           node-arch:
             - 2n-icx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-clx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-            - 2n-skx:
-                os: 'ubuntu2004'
+            - 2n-spr:
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-zn2:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-tx2:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'aarch64'
-            - 3n-skx:
-                os: 'ubuntu2004'
-                executor-arch: 'x86_64'
             - 3n-icx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 3n-tsh:
-                os: 'ubuntu2004'
+                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-trex-perf-verify-{stream}-{node-arch}':
           node-arch:
-            - 2n-skx:
-                os: 'ubuntu2004'
+            - 1n-aws:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 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:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-clx:
-                os: 'ubuntu2004'
-                executor-arch: 'x86_64'
-            - 2n-skx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-            - 2n-dnv:
-                os: 'ubuntu2004'
+            - 2n-spr:
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-zn2:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-tx2:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'aarch64'
-            - 3n-skx:
-                os: 'ubuntu2004'
-                executor-arch: 'x86_64'
             - 3n-icx:
-                os: 'ubuntu2004'
-                executor-arch: 'x86_64'
-            - 3n-dnv:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 3n-tsh:
-                os: 'ubuntu2004'
+                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'
           stream:
             - master:
                 branch: 'master'
                 branch-id: 'oper'
-            - '2110':
-                branch: 'rls2110'
-                branch-id: 'oper-rls2110'
-            - '2202':
-                branch: 'rls2202'
-                branch-id: 'oper-rls2202'
+            - '2310':
+                branch: 'rls2310'
+                branch-id: 'oper-rls2310'
       - 'csit-vpp-perf-mrr-daily-master-{node-arch}':
           node-arch:
             - 2n-icx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-                periodicity: '0 2 * * 1-5'
+                periodicity: '30 22 * * 0-4'
             - 2n-clx:
-                os: 'ubuntu2004'
-                executor-arch: 'x86_64'
-                periodicity: '0 2 * * 1-5'
-            - 2n-skx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-                periodicity: '0 2 * * 1-5'
-            - 2n-dnv:
-                os: 'ubuntu2004'
+                periodicity: '30 22 * * 0-4'
+            - 2n-spr:
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-                periodicity: '0 2 * * 1-5'
+                periodicity: '30 22 * * 0-4'
             - 2n-zn2:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-                periodicity: '0 2 * * 1-5'
+                periodicity: '30 22 * * 0-4'
             - 2n-tx2:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'aarch64'
-                periodicity: '0 2 * * 1-5'
-            - 3n-skx:
-                os: 'ubuntu2004'
-                executor-arch: 'x86_64'
-                periodicity: '0 2 * * 1-5'
+                periodicity: '30 22 * * 0-4'
             - 3n-icx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-                periodicity: '0 2 * * 1-5'
-            - 3n-dnv:
-                os: 'ubuntu2004'
-                executor-arch: 'x86_64'
-                periodicity: '0 2 * * 1-5'
+                periodicity: '30 22 * * 0-4'
             - 3n-tsh:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'aarch64'
-                periodicity: '0 2 * * 1-5'
-      - 'csit-vpp-perf-mrr-weekly-{stream}-{node-arch}':
+                periodicity: '30 22 * * 0-4'
+            - 3n-alt:
+                os: 'ubuntu2204'
+                executor-arch: 'aarch64'
+                periodicity: '30 22 * * 0-4'
+            - 3n-snr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+                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: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-            - 2n-clx:
-                os: 'ubuntu2004'
+                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'
-            - 2n-skx:
-                os: 'ubuntu2004'
+                periodicity: '30 22 * * 0-4'
+            - 3na-spr:
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-            - 3n-skx:
-                os: 'ubuntu2004'
+                periodicity: '30 22 * * 0-4'
+            - 3nb-spr:
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-            - 3n-icx:
-                os: 'ubuntu2004'
+                periodicity: '30 22 * * 0-4'
+      - 'csit-vpp-perf-mrr-weekly-{stream}-{node-arch}':
+          node-arch:
+            - 2n-icx:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 2n-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 2n-clx:
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-aws:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-            - 3n-aws:
-                os: 'ubuntu2004'
+            - 2n-c6in:
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
           stream:
             - master:
                 branch: 'master'
                 branch-id: 'oper'
           periodicity: '0 0 * * 6'
+      - 'csit-trex-perf-ndrpdr-weekly-master-{node-arch}':
+          node-arch:
+            - 1n-aws:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+                periodicity: '0 0 * * 6'
+            - 2n-icx:
+                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:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-clx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-            - 2n-skx:
-                os: 'ubuntu2004'
+            - 2n-spr:
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-            - 3n-skx:
-                os: 'ubuntu2004'
+            - 2n-zn2:
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+            - 2n-tx2:
+                os: 'ubuntu2204'
+                executor-arch: 'aarch64'
             - 3n-icx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-          periodicity: '0 0 * * 6'
-      - 'csit-trex-perf-ndrpdr-weekly-master-{node-arch}':
-          node-arch:
-            - 2n-skx:
-                os: 'ubuntu2004'
+            - 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:
             - 2n-icx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-clx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-            - 2n-skx:
-                os: 'ubuntu2004'
-                executor-arch: 'x86_64'
-            - 2n-dnv:
-                os: 'ubuntu2004'
+            - 2n-spr:
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-zn2:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-tx2:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'aarch64'
-            - 3n-skx:
-                os: 'ubuntu2004'
-                executor-arch: 'x86_64'
             - 3n-icx:
-                os: 'ubuntu2004'
-                executor-arch: 'x86_64'
-            - 3n-dnv:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 3n-tsh:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
+                executor-arch: 'aarch64'
+            - 3n-alt:
+                os: 'ubuntu2204'
                 executor-arch: 'aarch64'
             - 2n-aws:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 2n-c6in:
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 3n-aws:
-                os: 'ubuntu2004'
+                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:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-clx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-            - 2n-skx:
-                os: 'ubuntu2004'
-                executor-arch: 'x86_64'
-            - 2n-dnv:
-                os: 'ubuntu2004'
+            - 2n-spr:
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-zn2:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-tx2:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'aarch64'
-            - 3n-skx:
-                os: 'ubuntu2004'
-                executor-arch: 'x86_64'
             - 3n-icx:
-                os: 'ubuntu2004'
-                executor-arch: 'x86_64'
-            - 3n-dnv:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 3n-tsh:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
+                executor-arch: 'aarch64'
+            - 3n-alt:
+                os: 'ubuntu2204'
                 executor-arch: 'aarch64'
             - 2n-aws:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 3n-aws:
-                os: 'ubuntu2004'
+                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-iterative-{stream_report}-{node-arch}':
           node-arch:
-            - 2n-skx:
-                os: 'ubuntu2004'
+            - 1n-aws:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 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:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-clx:
-                os: 'ubuntu2004'
-                executor-arch: 'x86_64'
-            - 2n-skx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-            - 2n-dnv:
-                os: 'ubuntu2004'
+            - 2n-spr:
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-zn2:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-tx2:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'aarch64'
-            - 3n-skx:
-                os: 'ubuntu2004'
-                executor-arch: 'x86_64'
             - 3n-icx:
-                os: 'ubuntu2004'
-                executor-arch: 'x86_64'
-            - 3n-dnv:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 3n-tsh:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
+                executor-arch: 'aarch64'
+            - 3n-alt:
+                os: 'ubuntu2204'
                 executor-arch: 'aarch64'
             - 2n-aws:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 2n-c6in:
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 3n-aws:
-                os: 'ubuntu2004'
+                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:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-clx:
-                os: 'ubuntu2004'
-                executor-arch: 'x86_64'
-            - 2n-skx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-            - 2n-dnv:
-                os: 'ubuntu2004'
+            - 2n-spr:
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-zn2:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-tx2:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'aarch64'
-            - 3n-skx:
-                os: 'ubuntu2004'
-                executor-arch: 'x86_64'
             - 3n-icx:
-                os: 'ubuntu2004'
-                executor-arch: 'x86_64'
-            - 3n-dnv:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 3n-tsh:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
+                executor-arch: 'aarch64'
+            - 3n-alt:
+                os: 'ubuntu2204'
                 executor-arch: 'aarch64'
             - 2n-aws:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 2n-c6in:
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 3n-aws:
-                os: 'ubuntu2004'
+                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:
-            - 2n-skx:
-                os: 'ubuntu2004'
+            - 1n-aws:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 2n-icx:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
+            - 2n-spr:
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
 
     project: 'csit'
@@ -390,19 +515,13 @@
       - master:
           branch: 'master'
           branch-id: 'oper'
-      - '2110':
-          branch: 'rls2110'
-          branch-id: 'oper-rls2110'
-      - '2202':
-          branch: 'rls2202'
-          branch-id: 'oper-rls2202'
+      - '2310':
+          branch: 'rls2310'
+          branch-id: 'oper-rls2310'
     stream_report:
-      - '2110':
-          branch: 'rls2110'
-          branch-id: 'oper-rls2110'
-      - '2202':
-          branch: 'rls2202'
-          branch-id: 'oper-rls2202'
+      - '2310':
+          branch: 'rls2310'
+          branch-id: 'oper-rls2310'
 
     build-artifact-num-to-keep: 10
 
@@ -422,10 +541,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
@@ -454,7 +569,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: true
     latest-only: false
 
@@ -517,13 +632,70 @@
               <ul>
                   <li>check vpp perf mrr daily
               </ul>
-          <li>executor
+          <li>perf test-cases selection
+              <ul>
+                  <li>all CSIT VPP MRR perf suites
+              </ul>
+          <li>results
+              <ul>
+                  <li>jjb verify: PASS/FAIL
+                  <li>present: no
+                  <li>analyse: csit project (catch malfunctions/degradations)
+              </ul>
+      </ul>
+
+    project-type: freestyle
+    node: 'm-builder-{os}-prod-{executor-arch}'
+    concurrent: false
+    latest-only: false
+
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+      - gerrit-parameter:
+          branch: '{branch}'
+      - 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}"
+
+    wrappers:
+      - fdio-infra-wrappers-non-activity-timeout:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - timed: '{periodicity}'
+
+    builders:
+      - 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:
+      - fdio-infra-publish
+
+- job-template:
+    name: 'csit-vpp-perf-hoststack-daily-master-{node-arch}'
+
+    description: |
+      <ul>
+          <li>objective
               <ul>
-                  <li>builder-{os}-prod-{executor-arch}
+                  <li>check vpp perf hoststack daily
               </ul>
           <li>perf test-cases selection
               <ul>
-                  <li>all CSIT VPP MRR perf suites
+                  <li>all CSIT VPP HOSTSTACK perf suites
               </ul>
           <li>results
               <ul>
@@ -534,7 +706,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: false
     latest-only: false
 
@@ -582,10 +754,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
@@ -599,7 +767,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: false
     latest-only: false
 
@@ -647,10 +815,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
@@ -663,7 +827,7 @@
               </ul>
       </ul>
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: false
     latest-only: false
 
@@ -707,10 +871,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
@@ -723,7 +883,7 @@
               </ul>
       </ul>
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: false
     latest-only: false
 
@@ -773,10 +933,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
@@ -797,7 +953,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: true
     latest-only: false
 
@@ -817,11 +973,7 @@
           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'
+      # This job does not interact with VPP so not setting fail-on-crc-mismatch.
 
     scm:
       - gerrit-trigger-scm:
@@ -866,10 +1018,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
@@ -893,7 +1041,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: true
     latest-only: false
 
@@ -951,10 +1099,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
@@ -968,7 +1112,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: false
     latest-only: false
 
@@ -1027,10 +1171,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
@@ -1047,7 +1187,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: true
     latest-only: false
 
@@ -1116,10 +1256,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
@@ -1136,7 +1272,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: true
     latest-only: false
 
@@ -1205,10 +1341,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
@@ -1225,7 +1357,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: true
     latest-only: false
 
@@ -1294,10 +1426,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
@@ -1314,7 +1442,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: true
     latest-only: false
 
@@ -1383,10 +1511,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
@@ -1403,7 +1527,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: true
     latest-only: false
 
@@ -1472,10 +1596,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
@@ -1492,7 +1612,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'builder-{os}-prod-{executor-arch}'
+    node: 'm-builder-{os}-prod-{executor-arch}'
     concurrent: true
     latest-only: false