Split out release-merge job to separate project

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

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index c33f97ebf96a27260c6f851c8155e8ac4821b0c7..a336384ced2c0b1aa69ea569e891b97aedf87f0f 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -1,15 +1,41 @@
 ---
+- project:
+    name: groupbasedpolicy-silicon
+    jobs:
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: silicon
+    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'
+    build-timeout: 90
+    dependencies: >
+        openflowjava-merge-{stream},
+        openflowplugin-merge-{stream},
+        neutron-merge-{stream},
+        sfc-merge-{stream},
+        ovsdb-merge-{stream}
+    email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
+    disable-job: true
+
+    # Used by the release job
+    staging-profile-id: 96fbb93f95a76
+
 - project:
     name: groupbasedpolicy-aluminium
     jobs:
-      - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: aluminium
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
-    branch: 'master'
+    branch: 'stable/aluminium'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
@@ -81,6 +107,17 @@
     # Used by the release job
     staging-profile-id: 96fbb93f95a76
 
+- project:
+    name: groupbasedpolicy-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: groupbasedpolicy
+    project-name: groupbasedpolicy
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: groupbasedpolicy-settings
+
 - project:
     name: groupbasedpolicy-sonar
     jobs: