Move bier Sonar scan to Sonarcloud

[releng/builder.git] / jjb / bier / bier.yaml

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index 90b9bdbb6865d7c22b815b88e15c7a9e0cda5a4c..b740f5e886f4d9eb2f537b9e8e193f639cccc9a1 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -1,78 +1,64 @@
 ---
 - project:
-    name: bier-sodium
+    name: bier-aluminium
     jobs:
+      - gerrit-release-merge
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: aluminium
     project: 'bier'
     project-name: 'bier'
     branch: 'master'
     build-node: centos7-builder-2c-8g
     build-timeout: 90
     mvn-settings: 'bier-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: ''
     email-upstream: '[bier]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
 
 - project:
-    name: bier-neon
+    name: bier-magnesium
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: neon
+    stream: magnesium
     project: 'bier'
     project-name: 'bier'
-    branch: 'stable/neon'
+    branch: 'stable/magnesium'
     build-node: centos7-builder-2c-8g
     build-timeout: 90
     mvn-settings: 'bier-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: ''
     email-upstream: '[bier]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
 
 - project:
-    name: bier-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    stream: fluorine
-    project: 'bier'
-    project-name: 'bier'
-    branch: 'stable/fluorine'
-    build-node: centos7-builder-2c-8g
-    build-timeout: 90
-    mvn-settings: 'bier-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[bier]'
-
-    # Used by the release job
-    staging-profile-id: 942a8075b1f2a
-
-- project:
-    name: bier-oxygen
+    name: bier-sodium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: oxygen
+    stream: sodium
     project: 'bier'
     project-name: 'bier'
-    branch: 'stable/oxygen'
+    branch: 'stable/sodium'
     build-node: centos7-builder-2c-8g
     build-timeout: 90
     mvn-settings: 'bier-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: ''
     email-upstream: '[bier]'
-    disable-job: 'true'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
@@ -87,7 +73,12 @@
     branch: 'master'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'bier-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
+    disable-job: true
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: bier-view