Magnesium branch cut

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

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index 48ead3f8d7dab6b78b6ad54fc6b236c14701051d..14c91faf199a0294740beb44395405f1b8ffa921 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -1,16 +1,17 @@
 ---
 - project:
-    name: snmp-magnesium
+    name: snmp-aluminium
     jobs:
+      - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'snmp'
     project-name: 'snmp'
     branch: 'master'
     mvn-settings: 'snmp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[snmp] [odlparent]'
 
@@ -18,17 +19,17 @@
     staging-profile-id: a68fb236b93a6
 
 - project:
-    name: snmp-sodium
+    name: snmp-magnesium
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'snmp'
     project-name: 'snmp'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
     mvn-settings: 'snmp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[snmp] [odlparent]'
 
@@ -36,17 +37,17 @@
     staging-profile-id: a68fb236b93a6
 
 - project:
-    name: snmp-neon
+    name: snmp-sodium
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'snmp'
     project-name: 'snmp'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'snmp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[snmp] [odlparent]'
 
@@ -54,17 +55,17 @@
     staging-profile-id: a68fb236b93a6
 
 - project:
-    name: snmp-fluorine
+    name: snmp-neon
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'snmp'
     project-name: 'snmp'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     mvn-settings: 'snmp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[snmp] [odlparent]'
 
@@ -79,7 +80,7 @@
     project-name: 'snmp'
     branch: 'master'
     mvn-settings: 'snmp-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
 
 - project:
     name: snmp-view