Simplify sonar variables

[ci-management.git] / jjb / so / so-libs.yaml

diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index d571cf4..6422a06 100644 (file)
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -3,14 +3,20 @@
     name: so-libs
     project-name: 'so-libs'
     jobs:
-      - gerrit-maven-clm:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos7-builder-4c-4g
+          maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'so/libs'
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'so-libs-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
@@ -24,7 +30,12 @@
     name: so-libs-sonar
     jobs:
       - gerrit-maven-sonar
-    cron: 'H 11 * * *'
+    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: 'so/libs'
     project-name: 'so-libs'
@@ -32,3 +43,22 @@
     mvn-settings: 'so-libs-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: so-libs-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: so/libs
+    project-name: 'so-libs'
+    branch: 'master'
+    mvn-settings: 'so-libs-settings'
+
+- project:
+    name: so-libs-info
+    project-name: so-libs
+    jobs:
+      - gerrit-info-yaml-verify
+    project: so/libs
+    branch: master
+    branch: elalto