From 9e3aa93848c8268dfa2e770c31f560a054d6e3b5 Mon Sep 17 00:00:00 2001
From: "ankita.singhal" <ankita.singhal@t-systems.com>
Date: Tue, 15 Jul 2025 11:30:42 +0200
Subject: [PATCH] Updating ubuntu version to 22.04 for SDC

- Update ubuntu version for integration tests

Issue-ID: CIMAN-453
Change-Id: Id11aba1f92f1a574ed7c7e53dd3787c7ae4544f3
Signed-off-by: ankita.singhal <ankita.singhal@t-systems.com>
---
 jjb/sdc/sdc-csit.yaml |  4 ++--
 jjb/sdc/sdc.yaml      | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml
index cc714b4da..36bf470d4 100644
--- a/jjb/sdc/sdc-csit.yaml
+++ b/jjb/sdc/sdc-csit.yaml
@@ -8,7 +8,7 @@
           mvn-goals: clean install
           # yamllint disable-line rule:line-length
           mvn-params: "-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -Ddocker.skip.push=true -P docker,run-integration-tests-ui"
-          build-node: "ubuntu1804-docker-8c-16g"
+          build-node: "ubuntu2204-docker-8c-8g"
           archive-artifacts: >
             **/*.log
             **/hs_err_*.log
@@ -22,7 +22,7 @@
           mvn-goals: clean install
           # yamllint disable-line rule:line-length
           mvn-params: "-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -Ddocker.skip.push=true -P docker,run-integration-tests-api"
-          build-node: "ubuntu1804-docker-8c-16g"
+          build-node: "ubuntu2204-docker-8c-8g"
           archive-artifacts: >
             **/*.log
             **/hs_err_*.log
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index bd1320c23..899d462ab 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -35,9 +35,9 @@
       - "{project-name}-{stream}-verify-java":
           # this build is unit test only (Verify 1/3)
           mvn-params: "-P skip-integration-tests -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/"
-          build-node: "ubuntu1804-docker-8c-8g"
+          build-node: "ubuntu2204-docker-8c-8g"
       - "{project-name}-{stream}-sdc-merge-java":
-          build-node: "ubuntu1804-docker-8c-16g"
+          build-node: "ubuntu2204-docker-8c-8g"
           build-timeout: 180
           docker-pom: "pom.xml"
           mvn-profile: "docker"
@@ -64,7 +64,7 @@
       - gerrit-maven-docker-stage:
           build-timeout: 120
           sbom-generator: true
-          build-node: ubuntu1804-docker-v1-8c-8g
+          build-node: ubuntu2204-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: "-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/"
           mvn-version: "mvn36"
@@ -84,7 +84,7 @@
     mvn-settings: "sdc-settings"
     files: "**"
     archive-artifacts: ""
-    build-node: ubuntu1804-docker-8c-8g
+    build-node: ubuntu2204-docker-8c-8g
     maven-version: "mvn36"
 
 - project:
@@ -96,7 +96,7 @@
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "{sonar_mvn_goal}"
-    build-node: ubuntu1804-docker-8c-16g
+    build-node: ubuntu2204-docker-8c-8g
     project: "sdc"
     project-name: "sdc"
     branch: "master"
@@ -117,7 +117,7 @@
     nexus-iq-namespace: "onap-"
     project: sdc
     project-name: "sdc"
-    build-node: ubuntu1804-docker-8c-8g
+    build-node: ubuntu2204-docker-8c-8g
     stream:
       - "master":
           branch: "master"
-- 
2.16.6