Merge "Clean up log file size increase logic"

[releng/builder.git] / jjb / of-config / of-config.yaml

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index c4baf3664d86abcfee2a55b2dd5b265c11e18b9e..a4abe3060d1b05ad00a64b2dbaf9a967400d4ed3 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -1,52 +1,58 @@
 ---
 - project:
-    name: of-config-neon
+    name: of-config-aluminium
     jobs:
+      - gerrit-release-merge
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: neon
+    stream: aluminium
     project: 'of-config'
     project-name: 'of-config'
     branch: 'master'
     mvn-settings: 'of-config-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a6880455efe67
 
 - project:
-    name: of-config-fluorine
+    name: of-config-magnesium
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: fluorine
+    stream: magnesium
     project: 'of-config'
     project-name: 'of-config'
-    branch: 'stable/fluorine'
+    branch: 'stable/magnesium'
     mvn-settings: 'of-config-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a6880455efe67
 
 - project:
-    name: of-config-oxygen
+    name: of-config-sodium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: oxygen
+    stream: sodium
     project: 'of-config'
     project-name: 'of-config'
-    branch: 'stable/oxygen'
+    branch: 'stable/sodium'
     mvn-settings: 'of-config-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a6880455efe67
@@ -59,7 +65,8 @@
     project-name: 'of-config'
     branch: 'master'
     mvn-settings: 'of-config-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
+    disable-job: true
 
 - project:
     name: of-config-view