X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fcps%2Fcps-ncmp-dmi-plugin.yaml;h=e658a49052cc7ee8fd7c8c1ee4487961fdc2eb92;hb=e46f9aa926bb423cb983cfdcbd9d029cd69f5301;hp=2606a5b919d1e63551a1f7ca6f20e55e8eb8387c;hpb=7de07a8a2767e80ece76d9fefe134de311430900;p=ci-management.git

diff --git a/jjb/cps/cps-ncmp-dmi-plugin.yaml b/jjb/cps/cps-ncmp-dmi-plugin.yaml
index 2606a5b91..e658a4905 100644
--- a/jjb/cps/cps-ncmp-dmi-plugin.yaml
+++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml
@@ -6,52 +6,83 @@
       - project-view
 
 - project:
-    name: cps-ncmp-dmi-plugin-info
-    project: cps/ncmp-dmi-plugin
+    name: cps-ncmp-dmi-plugin-java17
+    java-version: openjdk17
+    mvn-version: mvn36
+    maven-version: mvn36
     project-name: cps-ncmp-dmi-plugin
-    build-node: centos7-builder-2c-1g
+    project: cps/ncmp-dmi-plugin
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
     jobs:
-      - gerrit-info-yaml-verify
+      - gerrit-maven-docker-verify:
+          container-public-registry: nexus3.onap.org:10001
+      - gerrit-maven-merge
+      - 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: -Pdocker
+          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
+      - "london":
+          branch: "london"
+          cron: ""
+      - "montreal":
+          branch: "montreal"
+          cron: ""
+    mvn-settings: cps-ncmp-dmi-plugin-settings
+    files: "**"
+    archive-artifacts: ""
+    build-node: centos8-docker-8c-8g
 
 - project:
-    name: cps-ncmp-dmi-plugin
+    name: cps-ncmp-dmi-plugin-java11
     java-version: openjdk11
     mvn-version: mvn36
     maven-version: mvn36
     project-name: cps-ncmp-dmi-plugin
     project: cps/ncmp-dmi-plugin
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
     jobs:
       - gerrit-maven-docker-verify:
           container-public-registry: nexus3.onap.org:10001
       - gerrit-maven-merge
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
+          sbom-generator: true
       - gerrit-maven-docker-stage:
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: -Pdocker
           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
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
     stream:
-      - 'master':
-          branch: master
-      - 'istanbul':
-          branch: 'istanbul'
-          cron: ''
+      - "kohn":
+          branch: "kohn"
+          cron: ""
     mvn-settings: cps-ncmp-dmi-plugin-settings
-    files: '**'
-    archive-artifacts: ''
-    build-node: centos7-docker-8c-8g
+    files: "**"
+    archive-artifacts: ""
+    build-node: centos8-docker-8c-8g
 
 - project:
     name: cps-ncmp-dmi-plugin-clm
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-version: mvn36
     maven-version: mvn36
     jobs:
@@ -61,60 +92,42 @@
     project-name: cps-ncmp-dmi-plugin
     branch: master
     mvn-settings: cps-ncmp-dmi-plugin-settings
-    build-node: centos7-docker-8c-8g
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
+    build-node: centos8-docker-8c-8g
 
 - project:
     name: cps-ncmp-dmi-plugin-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-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
-    build-node: centos7-docker-8c-8g
-    project: 'cps/ncmp-dmi-plugin'
-    project-name: 'cps-ncmp-dmi-plugin'
-    branch: 'master'
-    mvn-settings: 'cps-ncmp-dmi-plugin-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    build-node: centos8-docker-8c-8g
+    project: "cps/ncmp-dmi-plugin"
+    project-name: "cps-ncmp-dmi-plugin"
+    branch: "master"
+    mvn-settings: "cps-ncmp-dmi-plugin-settings"
+    mvn-goals: "clean install"
 
 - project:
     name: cps-ncmp-dmi-plugin-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-api-token: '{sonarcloud_api_token}'
-    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}'
-    build-node: centos7-docker-8c-8g
-    project: 'cps/ncmp-dmi-plugin'
-    project-name: 'cps-ncmp-dmi-plugin'
-    branch: 'master'
-    mvn-settings: 'cps-ncmp-dmi-plugin-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: cps-ncmp-dmi-plugin-whitesource
-    project-name: cps-ncmp-dmi-plugin
-    jobs:
-      - gerrit-whitesource-scan
-    java-version: openjdk11
-    mvn-version: mvn36
-    mvn-settings: cps-ncmp-dmi-plugin-settings
-    wss-product-name: cps-ncmp-dmi-plugin
-    mvn-clean-install: true
-    project: cps/ncmp-dmi-plugin
-    branch: master
-    build-node: centos7-docker-8c-8g
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    build-node: centos8-docker-8c-8g
+    project: "cps/ncmp-dmi-plugin"
+    project-name: "cps-ncmp-dmi-plugin"
+    branch: "master"
+    mvn-settings: "cps-ncmp-dmi-plugin-settings"
+    mvn-goals: "clean install"