Simplify sonar variables

[ci-management.git] / jjb / policy / policy-common.yaml

diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 2b7d045..cfc2cd0 100644 (file)
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -10,15 +10,14 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-builder-4c-4g
+          build-node: centos7-docker-8c-8g
 
     project: 'policy/common'
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'policy-common-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
@@ -27,12 +26,18 @@
     name: policy-common-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: 'policy/common'
     project-name: 'policy-common'
     branch: 'master'
     mvn-settings: 'policy-common-settings'
+    java-version: openjdk11
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
@@ -45,6 +50,7 @@
     project-name: 'policy-common'
     branch: 'master'
     mvn-settings: 'policy-common-settings'
+    java-version: openjdk11
 
 - project:
     name: policy-common-info