Split out release-merge job to separate project

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

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 9a93d7571a1bb7f00ba399506cd9ddd5f287c391..524d4136b5946b19ea7540b4c735098bcff4441b 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -1,16 +1,34 @@
 ---
+- project:
+    name: usc-silicon
+    jobs:
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+      - odl-maven-verify-jobs
+
+    stream: silicon
+    project: 'usc'
+    project-name: 'usc'
+    branch: 'master'
+    mvn-settings: 'usc-settings'
+    mvn-opts: '-Xmx1024m'
+    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
+    email-upstream: '[usc] [controller] [yangtools] [odlparent]'
+
+    # Used by the release job
+    staging-profile-id: a697b633b3ffe
+
 - project:
     name: usc-aluminium
     jobs:
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
     stream: aluminium
     project: 'usc'
     project-name: 'usc'
-    branch: 'master'
+    branch: 'stable/aluminium'
     mvn-settings: 'usc-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
@@ -57,6 +75,17 @@
     # Used by the release job
     staging-profile-id: a697b633b3ffe
 
+- project:
+    name: usc-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: usc
+    project-name: usc
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: usc-settings
+
 - project:
     name: usc-sonar
     jobs: