Remove all Neon jobs

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

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 36b12ad69b7741a6b4fc2f3b7235d66c8605a304..d44e686f977b12ffe714bda904be914a32d61c87 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -1,17 +1,19 @@
 ---
 - project:
-    name: groupbasedpolicy-sodium
+    name: groupbasedpolicy-aluminium
     jobs:
+      - gerrit-release-merge
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: aluminium
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'master'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     build-timeout: 90
     dependencies: >
         openflowjava-merge-{stream},
@@ -26,18 +28,19 @@
     staging-profile-id: 96fbb93f95a76
 
 - project:
-    name: groupbasedpolicy-neon
+    name: groupbasedpolicy-magnesium
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: neon
+    stream: magnesium
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
-    branch: 'stable/neon'
+    branch: 'stable/magnesium'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     build-timeout: 90
     dependencies: >
         openflowjava-merge-{stream},
@@ -52,18 +55,19 @@
     staging-profile-id: 96fbb93f95a76
 
 - project:
-    name: groupbasedpolicy-fluorine
+    name: groupbasedpolicy-sodium
     jobs:
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: fluorine
+    stream: sodium
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
-    branch: 'stable/fluorine'
+    branch: 'stable/sodium'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     build-timeout: 90
     dependencies: >
         openflowjava-merge-{stream},
@@ -87,7 +91,7 @@
     build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     disable-job: true
 
 - project: