From c35adfce41f87a5b08f0512138baf0bbbaf5d3aa Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 29 May 2025 16:03:01 -0400 Subject: [PATCH] Revert CCSDM CLM jobs to java 17 / maven 3.8 CCSDK CLM jobs are failing when run with java 21 / maven 3.9. For now, we can revert these jobs to Java 17 so we can verify third party vulnerability fixes for Paris release, and then we can work on finding a solution when we are ready to integrate our OpenDaylight Scandium changes. Issue-ID: CCSDK-4096 Change-Id: I8ec60ed1035bbe21a6e6200f0b80f36aec54a2b9 Signed-off-by: Dan Timoney --- jjb/ccsdk/apps.yaml | 6 +++--- jjb/ccsdk/ccsdk-oran.yaml | 6 +++--- jjb/ccsdk/cds.yaml | 6 +++--- jjb/ccsdk/distribution.yaml | 6 +++--- jjb/ccsdk/features.yaml | 6 +++--- jjb/ccsdk/parent.yaml | 6 +++--- jjb/ccsdk/sli.yaml | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 8027be0f8..410d1a740 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -121,8 +121,8 @@ stream: - "master": branch: "master" - java-version: openjdk21 - mvn-version: "mvn39" + java-version: openjdk17 + mvn-version: "mvn38" mvn-settings: "ccsdk-apps-settings" mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" - build-node: ubuntu2204-builder-4c-4g + build-node: centos8-builder-4c-4g diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml index 1ed92ea4b..0ab1eb3d5 100644 --- a/jjb/ccsdk/ccsdk-oran.yaml +++ b/jjb/ccsdk/ccsdk-oran.yaml @@ -92,11 +92,11 @@ stream: - "master": branch: "master" - java-version: openjdk21 - mvn-version: "mvn39" + java-version: openjdk17 + mvn-version: "mvn38" mvn-settings: "ccsdk-oran-settings" mvn-opts: "-Ddocker.skip=true --add-opens=java.base/java.util=ALL-UNNAMED" - build-node: ubuntu2204-builder-4c-4g + build-node: centos8-builder-4c-4g - project: name: ccsdk-oran-sonar diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index f595a5aff..204e9dbf4 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -113,8 +113,8 @@ stream: - "master": branch: "master" - java-version: openjdk21 - mvn-version: "mvn39" + java-version: openjdk17 + mvn-version: "mvn38" mvn-settings: "ccsdk-cds-settings" mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" - build-node: ubuntu2204-builder-4c-4g + build-node: centos8-builder-4c-4g diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 241e54ef8..ca14c59f7 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -95,8 +95,8 @@ stream: - "master": branch: "master" - java-version: openjdk21 - mvn-version: "mvn39" + java-version: openjdk17 + mvn-version: "mvn38" mvn-settings: "ccsdk-distribution-settings" mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" - build-node: ubuntu2204-docker-8c-8g + build-node: centos8-builder-4c-4g diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index c42b97a5b..f23fc3e3d 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -106,8 +106,8 @@ stream: - "master": branch: "master" - java-version: openjdk21 - mvn-version: "mvn39" + java-version: openjdk17 + mvn-version: "mvn38" mvn-settings: "ccsdk-features-settings" mvn-opts: "-Xmx3072m --add-opens=java.base/java.util=ALL-UNNAMED" - build-node: ubuntu2204-builder-4c-4g + build-node: centos8-builder-4c-4g diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 5abc9abf4..a48425699 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -92,8 +92,8 @@ stream: - "master": branch: "master" - java-version: openjdk21 - mvn-version: "mvn39" + java-version: openjdk17 + mvn-version: "mvn38" mvn-settings: "ccsdk-parent-settings" mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" - build-node: ubuntu2204-builder-4c-4g + build-node: centos8-builder-4c-4g diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml index c520e2f36..649b13acd 100644 --- a/jjb/ccsdk/sli.yaml +++ b/jjb/ccsdk/sli.yaml @@ -102,8 +102,8 @@ stream: - "master": branch: "master" - java-version: openjdk21 - mvn-version: "mvn39" + java-version: openjdk17 + mvn-version: "mvn38" mvn-settings: "ccsdk-sli-settings" mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" - build-node: ubuntu2204-builder-4c-4g + build-node: centos8-builder-4c-4g -- 2.16.6