Simplify sonar variables

[ci-management.git] / jjb / clamp / clamp.yaml

diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index 418f0f2..ca4ad1c 100644 (file)
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -34,6 +34,7 @@
         - 'dublin':
               branch: 'dublin'
     mvn-settings: 'clamp-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-docker-8c-8g
@@ -43,6 +44,11 @@
     jobs:
       - gerrit-maven-sonar:
           mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
+    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-docker-8c-8g
     project: 'clamp'
@@ -51,6 +57,7 @@
     mvn-settings: 'clamp-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: clamp-clm
@@ -64,6 +71,7 @@
     mvn-settings: 'clamp-settings'
     build-node: ubuntu1604-docker-8c-8g
     build-timeout: 120
+    java-version: openjdk11
 
 - project:
     name: clamp-info