From: Dan Timoney <dtimoney@att.com>
Date: Wed, 4 Jun 2025 12:38:23 +0000 (-0400)
Subject: Update CCSDK CLM jobs to use Java 21 / Maven 3.9
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=9c781e9ffa09eac6ac62730d493486627d0487e4;p=ci-management.git

Update CCSDK CLM jobs to use Java 21 / Maven 3.9

CCSDK CLM jobs are failing under java 17.  Update to use
java 21 / maven 3.9 and run on the same ubuntu build nodes
as rest of CCSDK java 21 jobs

Issue-ID: CCSDK-4096
Change-Id: Ife31485a40be9fb6950a44589f99ecc371fac34c
Signed-off-by: Dan Timoney <dtimoney@att.com>
---

diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 410d1a740..83f20b686 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -121,8 +121,8 @@
     stream:
       - "master":
           branch: "master"
-    java-version: openjdk17
-    mvn-version: "mvn38"
+    java-version: openjdk21
+    mvn-version: "mvn39"
     mvn-settings: "ccsdk-apps-settings"
     mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
-    build-node: centos8-builder-4c-4g
+    build-node: ubuntu2204-docker-8c-8g
diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index 0ab1eb3d5..69b5e0919 100644
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -92,11 +92,11 @@
     stream:
       - "master":
           branch: "master"
-    java-version: openjdk17
-    mvn-version: "mvn38"
+    java-version: openjdk21
+    mvn-version: "mvn39"
     mvn-settings: "ccsdk-oran-settings"
     mvn-opts: "-Ddocker.skip=true --add-opens=java.base/java.util=ALL-UNNAMED"
-    build-node: centos8-builder-4c-4g
+    build-node: ubuntu2204-docker-8c-8g
 
 - project:
     name: ccsdk-oran-sonar
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 204e9dbf4..482868ec0 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -113,8 +113,8 @@
     stream:
       - "master":
           branch: "master"
-    java-version: openjdk17
-    mvn-version: "mvn38"
+    java-version: openjdk21
+    mvn-version: "mvn39"
     mvn-settings: "ccsdk-cds-settings"
     mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
-    build-node: centos8-builder-4c-4g
+    build-node: ubuntu2204-docker-8c-8g
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index ca14c59f7..241e54ef8 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -95,8 +95,8 @@
     stream:
       - "master":
           branch: "master"
-    java-version: openjdk17
-    mvn-version: "mvn38"
+    java-version: openjdk21
+    mvn-version: "mvn39"
     mvn-settings: "ccsdk-distribution-settings"
     mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
-    build-node: centos8-builder-4c-4g
+    build-node: ubuntu2204-docker-8c-8g
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index f23fc3e3d..cc1d8917f 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -106,8 +106,8 @@
     stream:
       - "master":
           branch: "master"
-    java-version: openjdk17
-    mvn-version: "mvn38"
+    java-version: openjdk21
+    mvn-version: "mvn39"
     mvn-settings: "ccsdk-features-settings"
     mvn-opts: "-Xmx3072m --add-opens=java.base/java.util=ALL-UNNAMED"
-    build-node: centos8-builder-4c-4g
+    build-node: ubuntu2204-docker-8c-8g
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index a48425699..3f85cf8b9 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -92,8 +92,8 @@
     stream:
       - "master":
           branch: "master"
-    java-version: openjdk17
-    mvn-version: "mvn38"
+    java-version: openjdk21
+    mvn-version: "mvn39"
     mvn-settings: "ccsdk-parent-settings"
     mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
-    build-node: centos8-builder-4c-4g
+    build-node: ubuntu2204-docker-8c-8g
diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml
index 649b13acd..d5dfef1ec 100644
--- a/jjb/ccsdk/sli.yaml
+++ b/jjb/ccsdk/sli.yaml
@@ -102,8 +102,8 @@
     stream:
       - "master":
           branch: "master"
-    java-version: openjdk17
-    mvn-version: "mvn38"
+    java-version: openjdk21
+    mvn-version: "mvn39"
     mvn-settings: "ccsdk-sli-settings"
     mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
-    build-node: centos8-builder-4c-4g
+    build-node: ubuntu2204-docker-8c-8g