X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fp4plugin%2Fp4plugin.yaml;h=1c573655d4d2944304de2863d490292611ddd924;hb=fbb6852790ef13e01d614200cf9c9ac821105ef5;hp=0f6c51852864bf4a47cc40ba1358850cf0a164ba;hpb=f31613bc426189bee7f26d277d64cdddf792264a;p=releng%2Fbuilder.git

diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml
index 0f6c51852..1c573655d 100644
--- a/jjb/p4plugin/p4plugin.yaml
+++ b/jjb/p4plugin/p4plugin.yaml
@@ -1,16 +1,18 @@
 ---
 - project:
-    name: p4plugin-sodium
+    name: p4plugin-magnesium
     jobs:
       - '{project-name}-maven-javadoc-jobs'
+      - gerrit-release-merge
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'p4plugin'
     project-name: 'p4plugin'
     branch: 'master'
     mvn-settings: 'p4plugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: ''
     email-upstream: '[p4plugin]'
 
@@ -18,17 +20,18 @@
     staging-profile-id: a68bf26e208d4
 
 - project:
-    name: p4plugin-neon
+    name: p4plugin-sodium
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'p4plugin'
     project-name: 'p4plugin'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     mvn-settings: 'p4plugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: ''
     email-upstream: '[p4plugin]'
 
@@ -36,17 +39,18 @@
     staging-profile-id: a68bf26e208d4
 
 - project:
-    name: p4plugin-fluorine
+    name: p4plugin-neon
     jobs:
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'p4plugin'
     project-name: 'p4plugin'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     mvn-settings: 'p4plugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: ''
     email-upstream: '[p4plugin]'
 
@@ -54,21 +58,20 @@
     staging-profile-id: a68bf26e208d4
 
 - project:
-    name: p4plugin-oxygen
+    name: p4plugin-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'p4plugin'
     project-name: 'p4plugin'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'p4plugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: ''
     email-upstream: '[p4plugin]'
-    disable-job: true
 
     # Used by the release job
     staging-profile-id: a68bf26e208d4
@@ -82,7 +85,7 @@
     project-name: 'p4plugin'
     branch: 'master'
     mvn-settings: 'p4plugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
 
 - project:
     name: p4plugin-view