[CPS] Migrate CPS jobs to Java 17

As part of security works CPS is migrating to Java 17.
This requires the upgrade of JJB jobs starting with CPS and a subsequent patch for DMI Plugin

Issue-ID: CPS-1767

Signed-off-by: egernug <gerard.nugent@est.tech>
Change-Id: Ie736fe5c28e3acd5f9328c502dc4541b451466fa

diff --git a/jjb/cps/cps-csit.yaml b/jjb/cps/cps-csit.yaml
index e61ce2f..d57c0ab 100644 (file)
--- a/jjb/cps/cps-csit.yaml
+++ b/jjb/cps/cps-csit.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: cps-csit
+    name: cps-csit-java11
     jobs:
       - "{project-name}-review-verification-maven-{stream}":
           mvn-goals: clean install
@@ -14,12 +14,28 @@
     # project name in gerrit
     project: "cps"
     stream:
-      - "master":
-          branch: "master"
-      - "jakarta":
-          branch: "jakarta"
       - "kohn":
           branch: "kohn"
     mvn-settings: "cps-settings"
     robot-options: ""
     branch: "master"
+- project:
+    name: cps-csit-java17
+    jobs:
+      - "{project-name}-review-verification-maven-{stream}":
+          mvn-goals: clean install
+          mvn-params: "-Dmaven.test.skip=true -Ddocker.repository.push="
+      - "{project-name}-merge-verification-maven-{stream}":
+          mvn-goals: clean install
+          mvn-params: "-Dmaven.test.skip=true -Ddocker.repository.push="
+    project-name: "cps"
+    build-node: ubuntu1804-docker-8c-8g
+    recipients: "toine.siebelink@est.tech"
+    # project name in gerrit
+    project: "cps"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "cps-settings"
+    robot-options: ""
+    branch: "master"

diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml
index 1f6ffe4..6b14043 100644 (file)
--- a/jjb/cps/cps.yaml
+++ b/jjb/cps/cps.yaml
@@ -15,7 +15,7 @@
 
 - project:
     name: cps-clm
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-version: "mvn36"
     maven-version: "mvn36"
     jobs:
@@ -28,7 +28,7 @@
     build-node: centos8-docker-8c-8g
 
 - project:
-    name: cps
+    name: cps-java11
     java-version: openjdk11
     mvn-version: "mvn36"
     maven-version: "mvn36"
@@ -53,11 +53,6 @@
       - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
     stream:
-      - "master":
-          branch: "master"
-      - "jakarta":
-          branch: "jakarta"
-          cron: ""
       - "kohn":
           branch: "kohn"
           cron: ""
@@ -69,9 +64,42 @@
     archive-artifacts: ""
     build-node: centos8-docker-8c-8g
 
+- project:
+    name: cps-java17
+    java-version: openjdk17
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    project-name: "cps"
+    project: "cps"
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-params: "-P cps-ncmp-docker"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+          sbom-generator: true
+      - gerrit-maven-docker-stage:
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: "-P cps-ncmp-docker"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "cps-settings"
+    files: "**"
+    archive-artifacts: ""
+    build-node: centos8-docker-8c-8g
+
 - project:
     name: cps-sonar
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-version: "mvn36"
     maven-version: "mvn36"
     jobs:
@@ -91,7 +119,7 @@
 
 - project:
     name: cps-sonar-verify
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-version: "mvn36"
     maven-version: "mvn36"
     jobs: