X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fcps%2Fcps.yaml;h=629d4463feb05768ffa6c078150b66acaed46301;hb=63223cd59695611c568d19ed0c31b1bfd654fd37;hp=a56a50ea7b02df3dacd6b0960d1cf1b8ce78a265;hpb=5e7a1ae75944e02943490751184a2b2301079497;p=ci-management.git

diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml
index a56a50ea7..629d4463f 100644
--- a/jjb/cps/cps.yaml
+++ b/jjb/cps/cps.yaml
@@ -6,38 +6,65 @@
       - project-view
 
 - project:
-    name: cps-info
-    project: cps
-    project-name: cps
-    build-node: centos8-builder-2c-1g
+    name: cps-clm
+    java-version: openjdk17
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     jobs:
-      - gerrit-info-yaml-verify
+      - gerrit-maven-clm
+    nexus-iq-namespace: "onap-"
+    project: "cps"
+    project-name: "cps"
+    branch: "master"
+    mvn-settings: "cps-settings"
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
+    build-node: centos8-docker-8c-8g
 
 - project:
-      name: cps-clm
-      java-version: openjdk11
-      mvn-version: "mvn36"
-      maven-version: "mvn36"
-      jobs:
-          - gerrit-maven-clm
-      nexus-iq-namespace: 'onap-'
-      project: 'cps'
-      project-name: 'cps'
-      branch: 'master'
-      mvn-settings: 'cps-settings'
-      build-node: centos8-docker-8c-8g
+    name: cps-java11
+    java-version: openjdk11
+    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:
+      - "london":
+          branch: "london"
+          cron: ""
+    mvn-settings: "cps-settings"
+    files: "**"
+    archive-artifacts: ""
+    build-node: centos8-docker-8c-8g
 
 - project:
-    name: cps
-    java-version: openjdk11
+    name: cps-java17
+    java-version: openjdk17
     mvn-version: "mvn36"
     maven-version: "mvn36"
-    project-name: 'cps'
-    project: 'cps'
+    project-name: "cps"
+    project: "cps"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
+      - "{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
@@ -47,61 +74,55 @@
       - 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-8c-8g
+          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'
-      - 'jakarta':
-          branch: 'jakarta'
-          cron: ''
-      - 'kohn':
-          branch: 'kohn'
-          cron: ''
-    mvn-settings: 'cps-settings'
-    files: '**'
-    archive-artifacts: ''
+      - "master":
+          branch: "master"
+      - "montreal":
+          branch: "montreal"
+    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:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: centos8-docker-8c-8g
-    project: 'cps'
-    project-name: 'cps'
-    branch: 'master'
-    mvn-settings: 'cps-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "cps"
+    project-name: "cps"
+    branch: "master"
+    mvn-settings: "cps-settings"
+    mvn-goals: "clean install"
 
 - project:
     name: cps-sonar-verify
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-version: "mvn36"
     maven-version: "mvn36"
     jobs:
       - gerrit-maven-sonar-verify
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonarcloud-qualitygate-wait: true
-    sonar-mvn-goal: '{sonar_mvn_goal}'
+    sonar-mvn-goal: "{sonar_mvn_goal}"
     build-node: centos8-docker-8c-8g
-    project: 'cps'
-    project-name: 'cps'
-    branch: 'master'
-    mvn-settings: 'cps-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "cps"
+    project-name: "cps"
+    branch: "master"
+    mvn-settings: "cps-settings"
+    mvn-goals: "clean install"