From d8eb5eafedc383e0a6e0bc8ed23ccea6c8ebef81 Mon Sep 17 00:00:00 2001
From: Peter Mikus <peter.mikus@protonmail.ch>
Date: Mon, 22 Aug 2022 12:31:23 +0000
Subject: feat(csit): Switch 2n-clx and vpp_device to ubuntu2204

Signed-off-by: Peter Mikus <peter.mikus@protonmail.ch>
Change-Id: I91f4ebc33f132fd2e8bdbda42033fe57e81361c2
---
 jjb/csit/csit-perf.yaml       | 26 ++++++++++----------------
 jjb/csit/csit-vpp-device.yaml |  4 ++--
 jjb/vpp/vpp.yaml              |  6 +++---
 3 files changed, 15 insertions(+), 21 deletions(-)

(limited to 'jjb')

diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index 6223d9aa5..e5d6a0187 100644
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -24,7 +24,7 @@
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-clx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-dnv:
                 os: 'ubuntu2004'
@@ -56,7 +56,7 @@
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-clx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-zn2:
                 os: 'ubuntu2004'
@@ -88,7 +88,7 @@
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-clx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-dnv:
                 os: 'ubuntu2004'
@@ -131,7 +131,7 @@
                 executor-arch: 'x86_64'
                 periodicity: '30 22 * * 0-4'
             - 2n-clx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
                 periodicity: '30 22 * * 0-4'
             - 2n-dnv:
@@ -172,7 +172,7 @@
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-clx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 3n-icx:
                 os: 'ubuntu2004'
@@ -194,25 +194,19 @@
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-clx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 3n-icx:
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
           periodicity: '0 0 * * 6'
-      - 'csit-trex-perf-ndrpdr-weekly-master-{node-arch}':
-          node-arch:
-            - 2n-skx:
-                os: 'ubuntu2004'
-                executor-arch: 'x86_64'
-          periodicity: '0 0 * * 6'
       - 'csit-vpp-perf-report-iterative-{stream_report}-{node-arch}':
           node-arch:
             - 2n-icx:
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-clx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-dnv:
                 os: 'ubuntu2004'
@@ -250,7 +244,7 @@
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-clx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-dnv:
                 os: 'ubuntu2004'
@@ -293,7 +287,7 @@
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-clx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-dnv:
                 os: 'ubuntu2004'
@@ -331,7 +325,7 @@
                 os: 'ubuntu2004'
                 executor-arch: 'x86_64'
             - 2n-clx:
-                os: 'ubuntu2004'
+                os: 'ubuntu2204'
                 executor-arch: 'x86_64'
             - 2n-dnv:
                 os: 'ubuntu2004'
diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index 3c518efd2..b30913057 100644
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -17,12 +17,12 @@
     description: 'CSIT jenkins jobs.'
     node-arch:
       - '1n-skx':
-          os: 'ubuntu2004'
+          os: 'ubuntu2204'
           executor-arch: 'x86_64'
           make-parallel-jobs: '32'
           skip-vote: 'false'
       - '1n-tx2':
-          os: 'ubuntu2004'
+          os: 'ubuntu2204'
           executor-arch: 'aarch64'
           make-parallel-jobs: '32'
           skip-vote: 'true'
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index e8de49c85..102078c35 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -181,10 +181,10 @@
           branch-refspec: ''
     testbed-arch:
       - 1n-skx:
-          os: 'ubuntu2004'
+          os: 'ubuntu2204'
           executor-arch: 'x86_64'
       - 1n-tx2:
-          os: 'ubuntu2004'
+          os: 'ubuntu2204'
           executor-arch: 'aarch64'
           skip-vote: 'true'
 
@@ -212,7 +212,7 @@
           os: 'ubuntu2004'
           executor-arch: 'x86_64'
       - 2n-clx:
-          os: 'ubuntu2004'
+          os: 'ubuntu2204'
           executor-arch: 'x86_64'
       - 2n-zn2:
           os: 'ubuntu2004'
-- 
cgit 1.2.3-korg