X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fccsdk%2Ffeatures.yaml;h=7ffdc36a5361f7723e7d0ffbb14b88393dd560fb;hb=2197d45863af3496355dda957fabed01be445a8f;hp=fc8b655f76010fee2bcffcc6fe82ea35b341754d;hpb=971f13294b2ba4d0d4c1962a484b14e3be155630;p=ci-management.git

diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index fc8b655f7..7ffdc36a5 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -3,13 +3,17 @@
     name: ccsdk-features
     project-name: 'ccsdk-features'
     jobs:
-      - gerrit-maven-verify
+      - gerrit-maven-verify:
+          cron: ''
       - gerrit-maven-merge:
           cron: '@daily'
+          mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-stage:
           build-node: centos7-builder-4c-4g
           sign-artifacts: true
+          mvn-params: '-Dmaven.test.skip=true'
           cron: ''
+          sbom-generator: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 
@@ -17,6 +21,12 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'istanbul':
+          branch: 'istanbul'
+      - 'jakarta':
+          branch: 'jakarta'
+    java-version: openjdk11
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-features-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
@@ -25,9 +35,8 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn35"
     mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: centos7-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -41,14 +50,15 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: centos7-builder-4c-4g
     project: 'ccsdk/features'
     project-name: 'ccsdk-features'
     branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-features-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
-    maven-version: "mvn35"
+    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
 
 - project:
     name: ccsdk-features-clm
@@ -60,9 +70,11 @@
     stream:
       - 'master':
           branch: 'master'
+    java-version: openjdk11
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-features-settings'
-    maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
+    build-node: centos7-builder-4c-4g
 
 - project:
     name: ccsdk-features-info
@@ -75,12 +87,15 @@
 
 - project:
     name: ccsdk-features-whitesource
-    build-node: ubuntu1604-builder-8c-8g
+    build-node: centos7-builder-4c-4g
     project-name: ccsdk-features
     jobs:
       - gerrit-whitesource-scan
+    java-version: openjdk11
+    mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-features-settings'
     wss-product-name: ccsdk
     mvn-clean-install: true
+    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
     project: ccsdk/features
     branch: master