Remove all references to -XX:MaxPermSize

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

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index 90b9bdbb6865d7c22b815b88e15c7a9e0cda5a4c..9a01f109052637cb4eb6c7279530f182300819b6 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -1,78 +1,85 @@
 ---
 - project:
-    name: bier-sodium
+    name: bier-magnesium
     jobs:
+      - gerrit-release-merge
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     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-sodium
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'bier'
     project-name: 'bier'
-    branch: 'stable/neon'
+    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
 
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
 
 - project:
-    name: bier-fluorine
+    name: bier-neon
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'bier'
     project-name: 'bier'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     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-oxygen
+    name: bier-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'bier'
     project-name: 'bier'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     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 +94,8 @@
     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:
     name: bier-view