Simplify sonar variables

[ci-management.git] / jjb / ccsdk / features.yaml

diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 3d84e61..ea2624d 100644 (file)
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -3,17 +3,24 @@
     name: ccsdk-features
     project-name: 'ccsdk-features'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-verify
+      - gerrit-maven-merge:
+          cron: '@daily'
+      - gerrit-maven-stage:
+          build-node: centos7-builder-4c-4g
+          sign-artifacts: true
+          cron: ''
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
 
     project: 'ccsdk/features'
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - 'elalto':
+          branch: 'elalto'
+      - 'elalto-fluorine':
+          branch: 'elalto-fluorine'
     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
@@ -22,12 +29,21 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
+    maven-version: "mvn35"
+    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
     build-node: ubuntu1604-builder-4c-4g
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
 
 - project:
     name: ccsdk-features-sonar
     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: ubuntu1604-builder-4c-4g
     project: 'ccsdk/features'
@@ -35,7 +51,8 @@
     branch: 'master'
     mvn-settings: 'ccsdk-features-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
+    maven-version: "mvn35"
 
 - project:
     name: ccsdk-features-clm
@@ -47,9 +64,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
     mvn-settings: 'ccsdk-features-settings'
+    maven-version: "mvn35"
     build-node: ubuntu1604-builder-4c-4g
 
 - project:
@@ -59,3 +75,15 @@
       - gerrit-info-yaml-verify
     project: ccsdk/features
     branch: master
+
+- project:
+    name: ccsdk-features-whitesource
+    build-node: ubuntu1604-builder-8c-8g
+    project-name: ccsdk-features
+    jobs:
+      - gerrit-whitesource-scan
+    mvn-settings: 'ccsdk-features-settings'
+    wss-product-name: ccsdk
+    mvn-clean-install: true
+    project: ccsdk/features
+    branch: master