Merge "Update pre-commit hooks 2020-05-14"

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

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index 9d6b0eb72ccaa75538b5492b4c1350b268851475..e8d9f2ae7ced4bb50b8efe3cf9ee6ee5aa743a0b 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -1,37 +1,19 @@
 ---
 - project:
-    name: bier-magnesium
+    name: bier-aluminium
     jobs:
+      - gerrit-release-merge
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: magnesium
+    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'
-    dependencies: ''
-    email-upstream: '[bier]'
-    disable-job: true
-
-    # Used by the release job
-    staging-profile-id: 942a8075b1f2a
-
-- project:
-    name: bier-sodium
-    jobs:
-      - odl-maven-jobs
-
-    stream: sodium
-    project: 'bier'
-    project-name: 'bier'
-    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
@@ -40,18 +22,19 @@
     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
@@ -60,18 +43,19 @@
     staging-profile-id: 942a8075b1f2a
 
 - project:
-    name: bier-fluorine
+    name: bier-sodium
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: fluorine
+    stream: sodium
     project: 'bier'
     project-name: 'bier'
-    branch: 'stable/fluorine'
+    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
@@ -89,7 +73,7 @@
     branch: 'master'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'bier-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     disable-job: true
 
 - project: