Merge "feat(csit): Add 2n-spr jobs"

2 files changed, 53 insertions, 17 deletions

diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index bf892d9e6..bf55603c8 100644
--- 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'
@@ -52,6 +55,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'
@@ -79,6 +85,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 +96,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'
@@ -109,9 +121,6 @@
             - master:
                 branch: 'master'
                 branch-id: 'oper'
-            - '2210':
-                branch: 'rls2210'
-                branch-id: 'oper-rls2210'
             - '2302':
                 branch: 'rls2302'
                 branch-id: 'oper-rls2302'
@@ -125,6 +134,10 @@
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
                 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'
@@ -155,6 +168,10 @@
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
                 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'
@@ -164,6 +181,9 @@
             - 2n-icx:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+            - 2n-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
             - 2n-clx:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
@@ -185,6 +205,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,6 +217,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'
@@ -220,6 +247,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'
@@ -252,6 +282,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'
@@ -284,6 +317,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:
@@ -292,6 +328,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'
@@ -324,6 +363,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'
@@ -356,6 +398,9 @@
             - 2n-icx:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
+            - 2n-spr:
+                os: 'ubuntu2204'
+                executor-arch: 'x86_64'
 
     project: 'csit'
     branch: 'master'
@@ -366,16 +411,10 @@
       - master:
           branch: 'master'
           branch-id: 'oper'
-      - '2210':
-          branch: 'rls2210'
-          branch-id: 'oper-rls2210'
       - '2302':
           branch: 'rls2302'
           branch-id: 'oper-rls2302'
     stream_report:
-      - '2210':
-          branch: 'rls2210'
-          branch-id: 'oper-rls2210'
       - '2302':
           branch: 'rls2302'
           branch-id: 'oper-rls2302'
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 472779370..58a64154a 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -229,9 +229,6 @@
       - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2210':
-          branch: 'stable/2210'
-          branch-refspec: ''
       - '2302':
           branch: 'stable/2302'
           branch-refspec: ''
@@ -263,6 +260,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'
@@ -301,9 +301,6 @@
       - 'master':
           branch: 'master'
           branch-refspec: ''
-      - '2210':
-          branch: 'stable/2210'
-          branch-refspec: ''
       - '2302':
           branch: 'stable/2302'
           branch-refspec: ''