X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fcps%2Fcps.yaml;h=d242d463f80917aab292709c1d741f8e0da6397a;hb=be393aa59919efb5dd0e98c27741361393188291;hp=3f7842aad3a9eda104f393624eca67f7308fbff1;hpb=1e614bf019b6642ce9f677e34a4df5fb100730fa;p=ci-management.git

diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml
index 3f7842aad..d242d463f 100644
--- a/jjb/cps/cps.yaml
+++ b/jjb/cps/cps.yaml
@@ -16,6 +16,8 @@
 - project:
       name: cps-clm
       java-version: openjdk11
+      mvn-version: "mvn36"
+      maven-version: "mvn36"
       jobs:
           - gerrit-maven-clm
       nexus-iq-namespace: 'onap-'
@@ -23,24 +25,29 @@
       project-name: 'cps'
       branch: 'master'
       mvn-settings: 'cps-settings'
-      build-node: ubuntu1804-builder-4c-4g
+      build-node: centos7-docker-8c-8g
 
 - project:
     name: cps
     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'
+      - '{project-name}-{stream}-merge-java':
+          docker-pom: 'pom.xml'
+          mvn-params: "-P cps-ncmp-docker"
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
+          sbom-generator: true
       - gerrit-maven-docker-stage:
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker'
+          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':
@@ -48,14 +55,22 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
+          cron: ''
+      - 'jakarta':
+          branch: 'jakarta'
+          cron: ''
     mvn-settings: 'cps-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: centos7-docker-8c-8g
 
 - project:
     name: cps-sonar
     java-version: openjdk11
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
@@ -64,10 +79,45 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: centos7-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:
+    name: cps-sonar-verify
+    java-version: openjdk11
+    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-qualitygate-wait: true
+    sonar-mvn-goal: '{sonar_mvn_goal}'
+    build-node: centos7-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:
+    name: cps-whitesource
+    project-name: cps
+    jobs:
+      - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: 'mvn36'
+    mvn-settings: 'cps-settings'
+    wss-product-name: cps
+    mvn-clean-install: true
+    project: cps
+    branch: master
+    build-node: centos7-docker-8c-8g