csit: Add rls2206 jobs, remove rls2110 jobs

Change-Id: I4430643f1d5592327251503673e0098f8cf9752c
Signed-off-by: Tibor Frank <tifrank@cisco.com>

diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index 05b6179..c1e102c 100644 (file)
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2022 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.
@@ -130,12 +130,12 @@
             - master:
                 branch: 'master'
                 branch-id: 'oper'
-            - '2110':
-                branch: 'rls2110'
-                branch-id: 'oper-rls2110'
             - '2202':
                 branch: 'rls2202'
                 branch-id: 'oper-rls2202'
+            - '2206':
+                branch: 'rls2206'
+                branch-id: 'oper-rls2206'
       - 'csit-vpp-perf-mrr-daily-master-{node-arch}':
           node-arch:
             - 2n-icx:
@@ -421,19 +421,19 @@
       - master:
           branch: 'master'
           branch-id: 'oper'
-      - '2110':
-          branch: 'rls2110'
-          branch-id: 'oper-rls2110'
       - '2202':
           branch: 'rls2202'
           branch-id: 'oper-rls2202'
+      - '2206':
+          branch: 'rls2206'
+          branch-id: 'oper-rls2206'
     stream_report:
-      - '2110':
-          branch: 'rls2110'
-          branch-id: 'oper-rls2110'
       - '2202':
           branch: 'rls2202'
           branch-id: 'oper-rls2202'
+      - '2206':
+          branch: 'rls2206'
+          branch-id: 'oper-rls2206'
 
     build-artifact-num-to-keep: 10
 

diff --git a/jjb/csit/csit-tox.yaml b/jjb/csit/csit-tox.yaml
index 4b55df1..e83e5a1 100644 (file)
--- a/jjb/csit/csit-tox.yaml
+++ b/jjb/csit/csit-tox.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2022 Cisco 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:
@@ -25,10 +25,10 @@
     stream:
       - master:
           branch: 'master'
-      - '2110':
-          branch: 'rls2110'
       - '2202':
           branch: 'rls2202'
+      - '2206':
+          branch: 'rls2206'
 
 - job-template:
     name: 'csit-verify-tox-{stream}-{os}-{executor-arch}'

diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index 06c2206..3c518ef 100644 (file)
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2022 Cisco 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:
@@ -33,23 +33,23 @@
             - master:
                 branch: 'master'
                 branch-id: 'oper'
-            - '2110':
-                branch: 'rls2110'
-                branch-id: 'oper-rls2110'
             - '2202':
                 branch: 'rls2202'
                 branch-id: 'oper-rls2202'
+            - '2206':
+                branch: 'rls2206'
+                branch-id: 'oper-rls2206'
       - 'csit-vpp-device-{stream}-{os}-{executor-arch}-{node-arch}-weekly':
           stream:
             - master:
                 branch: 'master'
                 branch-id: 'oper'
-            - '2110':
-                branch: 'rls2110'
-                branch-id: 'oper-rls2110'
             - '2202':
                 branch: 'rls2202'
                 branch-id: 'oper-rls2202'
+            - '2206':
+                branch: 'rls2206'
+                branch-id: 'oper-rls2206'
 
     project: 'csit'
     branch: 'master'
@@ -58,12 +58,12 @@
       - master:
           branch: 'master'
           branch-id: 'oper'
-      - '2110':
-          branch: 'rls2110'
-          branch-id: 'oper-rls2110'
       - '2202':
           branch: 'rls2202'
           branch-id: 'oper-rls2202'
+      - '2206':
+          branch: 'rls2206'
+          branch-id: 'oper-rls2206'
 
 - job-template:
     name: 'csit-vpp-device-{stream}-{os}-{executor-arch}-{node-arch}'

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 4070359..8eba745 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2022 Cisco 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:
@@ -30,10 +30,10 @@
     stream:
       - master:
           branch: 'master'
-      - '2110':
-          branch: 'rls2110'
       - '2202':
           branch: 'rls2202'
+      - '2206':
+          branch: 'rls2206'
 
 - project:
     name: csit-view