From 1258ba0683f5c7cbfae93f3a37d2e84b9e9af9e0 Mon Sep 17 00:00:00 2001
From: Peter Mikus <peter.mikus@protonmail.ch>
Date: Tue, 13 Sep 2022 13:42:08 +0200
Subject: [PATCH] feat(csit): Ubuntu 2204 Job Cleanup

Signed-off-by: Peter Mikus <peter.mikus@protonmail.ch>
Change-Id: I53e67d34923558f89af3393791168e191064aa40
---
 jjb/csit/csit-perf.yaml       | 22 ++++++++--------------
 jjb/csit/csit-tox.yaml        |  2 +-
 jjb/csit/csit-vpp-device.yaml | 27 +++++++++------------------
 jjb/csit/csit.yaml            |  2 +-
 4 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index ee2f02977..3230f7366 100644
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -48,7 +48,7 @@
                 os: 'ubuntu2204'
                 executor-arch: 'aarch64'
             - 3n-snr:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
       - 'csit-dpdk-perf-mrr-weekly-master-{node-arch}':
           node-arch:
@@ -74,7 +74,7 @@
                 os: 'ubuntu2204'
                 executor-arch: 'aarch64'
             - 3n-snr:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
           periodicity: '0 0 * * 6'
       - 'csit-trex-perf-verify-{stream}-{node-arch}':
@@ -112,7 +112,7 @@
                 os: 'ubuntu2204'
                 executor-arch: 'aarch64'
             - 3n-snr:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
           stream:
             - master:
@@ -163,7 +163,7 @@
                 executor-arch: 'aarch64'
                 periodicity: '30 22 * * 0-4'
             - 3n-snr:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
                 periodicity: '30 22 * * 0-4'
       - 'csit-vpp-perf-mrr-weekly-{stream}-{node-arch}':
@@ -174,15 +174,9 @@
             - 2n-clx:
                 os: 'ubuntu2204'
                 executor-arch: 'x86_64'
-            - 3n-icx:
-                os: 'ubuntu2204'
-                executor-arch: 'x86_64'
             - 2n-aws:
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
-            - 3n-snr:
-                os: 'ubuntu2004'
-                executor-arch: 'x86_64'
           stream:
             - master:
                 branch: 'master'
@@ -236,7 +230,7 @@
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 3n-snr:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
       - 'csit-dpdk-perf-report-iterative-{stream_report}-{node-arch}':
           node-arch:
@@ -274,7 +268,7 @@
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 3n-snr:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
       - 'csit-trex-perf-report-iterative-{stream_report}-{node-arch}':
           node-arch:
@@ -317,7 +311,7 @@
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 3n-snr:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
       - 'csit-dpdk-perf-report-coverage-{stream_report}-{node-arch}':
           node-arch:
@@ -355,7 +349,7 @@
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 3n-snr:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
       - 'csit-trex-perf-report-coverage-{stream_report}-{node-arch}':
           node-arch:
diff --git a/jjb/csit/csit-tox.yaml b/jjb/csit/csit-tox.yaml
index e83e5a189..efe7abd79 100644
--- a/jjb/csit/csit-tox.yaml
+++ b/jjb/csit/csit-tox.yaml
@@ -20,7 +20,7 @@
 
     project: 'csit'
     branch: 'master'
-    os: 'ubuntu2004'
+    os: 'ubuntu2204'
     executor-arch: 'x86_64'
     stream:
       - master:
diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index b30913057..02943e87a 100644
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -33,23 +33,17 @@
             - master:
                 branch: 'master'
                 branch-id: 'oper'
-            - '2202':
-                branch: 'rls2202'
-                branch-id: 'oper-rls2202'
-            - '2206':
-                branch: 'rls2206'
-                branch-id: 'oper-rls2206'
+#            - '2210':
+#                branch: 'rls2210'
+#                branch-id: 'oper-rls2210'
       - 'csit-vpp-device-{stream}-{os}-{executor-arch}-{node-arch}-weekly':
           stream:
             - master:
                 branch: 'master'
                 branch-id: 'oper'
-            - '2202':
-                branch: 'rls2202'
-                branch-id: 'oper-rls2202'
-            - '2206':
-                branch: 'rls2206'
-                branch-id: 'oper-rls2206'
+#            - '2210':
+#                branch: 'rls2210'
+#                branch-id: 'oper-rls2210'
 
     project: 'csit'
     branch: 'master'
@@ -58,12 +52,9 @@
       - master:
           branch: 'master'
           branch-id: 'oper'
-      - '2202':
-          branch: 'rls2202'
-          branch-id: 'oper-rls2202'
-      - '2206':
-          branch: 'rls2206'
-          branch-id: 'oper-rls2206'
+#      - '2210':
+#          branch: 'rls2210'
+#          branch-id: 'oper-rls2210'
 
 - 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 c75e4819b..d2b75a0fc 100644
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -23,7 +23,7 @@
     project: 'csit'
     branch: 'master'
     os:
-      - 'ubuntu2004'
+      - 'ubuntu2204'
     executor-arch: 'x86_64'
     build-artifact-num-to-keep: 10
     stream:
-- 
2.16.6