From: Dan Timoney Date: Wed, 14 May 2025 20:11:29 +0000 (-0400) Subject: Use Java 21 / Maven 3.9 for current SDNC release X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=bc37284eb9585601e6f9bfbfe783af9742c9aab7;p=ci-management.git Use Java 21 / Maven 3.9 for current SDNC release Latest OpenDaylight version requires Java 21 and Maven version >= 3.9.5 Issue-ID: CCSDK-4089 Change-Id: I1274b49a241fa88aabcac794a3794f06559193f6 Signed-off-by: Dan Timoney --- diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 7990e18b4..78e1291a9 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -85,8 +85,6 @@ branch: "oslo" - "newdelhi": branch: "newdelhi" - - "master": - branch: "master" java-version: openjdk17 mvn-version: "mvn38" mvn-settings: "sdnc-apps-settings" @@ -103,6 +101,54 @@ mvn-snapshot-id: "ecomp-snapshots" nexus-snapshot-repo: "snapshots" +- project: + name: sdnc-apps-java21 + project-name: "sdnc-apps" + jobs: + - gerrit-maven-verify: + build-node: ubuntu2204-docker-8c-8g + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + mvn-params: "-Ddocker.skip.push=true -Pdocker" + - gerrit-maven-merge: + cron: "@daily" + mvn-params: "-Dmaven.test.skip=true" + - gerrit-maven-stage: + build-node: ubuntu2204-docker-8c-8g + sign-artifacts: true + mvn-params: "-Dmaven.test.skip=true" + cron: "" + sbom-generator: true + - gerrit-maven-docker-stage: + cron: "@daily" + build-node: ubuntu2204-docker-8c-8g + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + mvn-params: "-Dmaven.test.skip=true -Pdocker" + maven-versions-plugin: true + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "sdnc/apps" + stream: + - "master": + branch: "master" + java-version: openjdk21 + mvn-version: "mvn39" + mvn-settings: "sdnc-apps-settings" + + # due to a strange macro / variable translation problem this needs to be + # passed as a string block to properly get the properties correctly defined + # in the job + maven-deploy-properties: | + deployAtEnd=true + files: "**" + archive-artifacts: "" + maven-version: "mvn39" + build-node: ubuntu2204-builder-4c-4g + mvn-snapshot-id: "ecomp-snapshots" + nexus-snapshot-repo: "snapshots" + - project: name: sdnc-apps-sonar jobs: @@ -111,16 +157,16 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2204-builder-4c-4g project: "sdnc/apps" project-name: "sdnc-apps" branch: "master" - java-version: openjdk17 - mvn-version: "mvn38" + java-version: openjdk21 + mvn-version: "mvn39" mvn-settings: "sdnc-apps-settings" mvn-goals: "clean install" mvn-opts: "-Xmx1024m" - maven-version: "mvn38" + maven-version: "mvn39" - project: name: sdnc-apps-clm @@ -129,11 +175,11 @@ nexus-iq-namespace: "onap-" project: sdnc/apps project-name: "sdnc-apps" - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2204-builder-4c-4g stream: - "master": branch: "master" - java-version: openjdk17 - mvn-version: "mvn38" + java-version: openjdk21 + mvn-version: "mvn39" mvn-settings: "sdnc-apps-settings" mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 02fccbc43..861e83372 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -38,7 +38,7 @@ nexus-snapshot-repo: "snapshots" - project: - name: sdnc-northbound-current-java17 + name: sdnc-northbound-current-java21 project-name: "sdnc-northbound" jobs: - gerrit-maven-verify @@ -46,7 +46,7 @@ cron: "@daily" - gerrit-maven-stage: sign-artifacts: true - build-node: centos8-docker-8c-8g + build-node: ubuntu2204-docker-8c-8g cron: "" sbom-generator: true - "{project-name}-gerrit-release-jobs": @@ -56,8 +56,8 @@ stream: - "master": branch: "master" - java-version: openjdk17 - mvn-version: "mvn38" + java-version: openjdk21 + mvn-version: "mvn39" mvn-settings: "sdnc-northbound-settings" # due to a strange macro / variable translation problem this needs to be @@ -67,8 +67,8 @@ deployAtEnd=true files: "**" archive-artifacts: "" - maven-version: "mvn38" - build-node: ubuntu1804-builder-4c-4g + maven-version: "mvn39" + build-node: ubuntu2204-builder-4c-4g mvn-snapshot-id: "ecomp-snapshots" nexus-snapshot-repo: "snapshots" @@ -80,14 +80,14 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2204-builder-4c-4g project: "sdnc/northbound" project-name: "sdnc-northbound" branch: "master" mvn-settings: "sdnc-northbound-settings" mvn-goals: "clean install" - java-version: openjdk17 - mvn-version: "mvn38" + java-version: openjdk21 + mvn-version: "mvn39" mvn-opts: "-Xmx1024m" - project: @@ -97,11 +97,11 @@ nexus-iq-namespace: "onap-" project: sdnc/northbound project-name: "sdnc-northbound" - build-node: ubuntu1804-builder-4c-4g + build-node: ubuntu2204-builder-4c-4g stream: - "master": branch: "master" mvn-settings: "sdnc-northbound-settings" - java-version: openjdk17 - mvn-version: "mvn38" + java-version: openjdk21 + mvn-version: "mvn39" mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 57912118d..4d56167a9 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -41,7 +41,7 @@ nexus-snapshot-repo: "snapshots" - project: - name: sdnc-oam-current-java17 + name: sdnc-oam-current-java21 project-name: "sdnc-oam" jobs: - gerrit-maven-verify: @@ -50,14 +50,14 @@ cron: "@daily" mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: - build-node: centos8-docker-8c-8g + build-node: ubuntu2204-docker-8c-8g sign-artifacts: true mvn-params: "-Dmaven.test.skip=true" cron: "" sbom-generator: true - gerrit-maven-docker-stage: cron: "@daily" - build-node: centos8-docker-8c-8g + build-node: ubuntu2204-docker-8c-8g container-public-registry: "nexus3.onap.org:10001" container-staging-registry: "nexus3.onap.org:10003" mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker" @@ -68,13 +68,13 @@ stream: - "master": branch: "master" - java-version: openjdk17 - mvn-version: "mvn38" + java-version: openjdk21 + mvn-version: "mvn39" mvn-settings: "sdnc-oam-settings" files: "**" archive-artifacts: "" sign-artifacts: true - build-node: centos8-docker-8c-8g + build-node: ubuntu2204-docker-8c-8g shallow-clone: true mvn-snapshot-id: "ecomp-snapshots" nexus-snapshot-repo: "snapshots" @@ -86,11 +86,11 @@ nexus-iq-namespace: "onap-" project: sdnc/oam project-name: "sdnc-oam" - build-node: centos8-docker-8c-8g + build-node: ubuntu2204-docker-8c-8g stream: - "master": branch: "master" mvn-settings: "sdnc-oam-settings" - java-version: openjdk17 - mvn-version: "mvn38" + java-version: openjdk21 + mvn-version: "mvn39" mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"