Split out release-merge job to separate project

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

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index 959acae106a684ff92192fd0d5ba4697dd539470..dcc3761b12320f3fdf740c47f75910c4d125c2a2 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -1,17 +1,18 @@
 ---
 - project:
-    name: bier-sodium
+    name: bier-silicon
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: silicon
     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
@@ -20,18 +21,19 @@
     staging-profile-id: 942a8075b1f2a
 
 - project:
-    name: bier-neon
+    name: bier-aluminium
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: neon
+    stream: aluminium
     project: 'bier'
     project-name: 'bier'
-    branch: 'stable/neon'
+    branch: 'stable/aluminium'
     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
@@ -40,18 +42,19 @@
     staging-profile-id: 942a8075b1f2a
 
 - project:
-    name: bier-fluorine
+    name: bier-magnesium
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: fluorine
+    stream: magnesium
     project: 'bier'
     project-name: 'bier'
-    branch: 'stable/fluorine'
+    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
@@ -60,26 +63,37 @@
     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
 
+- project:
+    name: bier-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: bier
+    project-name: bier
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: bier-settings
+
 - project:
     name: bier-sonar
     jobs:
@@ -90,8 +104,21 @@
     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-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: bier
+    project-name: bier
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: bier-view