Merge "Set odlparent doc-dir to {envtmpdir}"

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

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index b66975f183284dd73908529232d8494f88d255c4..6de9899b7c9d0f749dcd3b2df07c7b34c8092736 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -1,69 +1,77 @@
 ---
 - project:
-    name: nemo-sodium
+    name: nemo-magnesium
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
+      - gerrit-release-merge
 
-    stream: sodium
+    stream: magnesium
     project: 'nemo'
     project-name: 'nemo'
     branch: 'master'
     mvn-settings: 'nemo-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: ''
     email-upstream: '[nemo]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a67a9890f6202
 
 - project:
-    name: nemo-neon
+    name: nemo-sodium
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'nemo'
     project-name: 'nemo'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'nemo-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: ''
     email-upstream: '[nemo]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a67a9890f6202
 
 - project:
-    name: nemo-fluorine
+    name: nemo-neon
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'nemo'
     project-name: 'nemo'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     mvn-settings: 'nemo-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: ''
     email-upstream: '[nemo]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a67a9890f6202
 
 - project:
-    name: nemo-oxygen
+    name: nemo-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'nemo'
     project-name: 'nemo'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'nemo-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: ''
     email-upstream: '[nemo]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: a67a9890f6202
@@ -76,7 +84,8 @@
     project-name: 'nemo'
     branch: 'master'
     mvn-settings: 'nemo-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
+    disable-job: true
 
 - project:
     name: nemo-view