Split out release-merge job to separate project

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

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 6bdd54d834f279b5f1641dc7568c8813fd3c36a3..a070bf7276c624bc5ec939a630dcc986c273908d 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: jsonrpc-silicon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: jsonrpc
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/
+          rtd-token: 04d31d4414734686d63f9b160e974fe5a18d031d
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    project: 'jsonrpc'
+    project-name: 'jsonrpc'
+    stream: silicon
+    java-version: 'openjdk11'
+    branch: 'master'
+    mvn-settings: 'jsonrpc-settings'
+    mvn-opts: '-Xmx1024m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
+    email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
+
+    # Used by the release job
+    staging-profile-id: 96fdf4408765d
+
 - project:
     name: jsonrpc-aluminium
     jobs:
@@ -8,7 +33,6 @@
           project-pattern: jsonrpc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/
           rtd-token: 04d31d4414734686d63f9b160e974fe5a18d031d
-      - gerrit-release-merge
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
@@ -16,7 +40,7 @@
     project-name: 'jsonrpc'
     stream: aluminium
     java-version: 'openjdk11'
-    branch: 'master'
+    branch: 'stable/aluminium'
     mvn-settings: 'jsonrpc-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
@@ -73,6 +97,17 @@
     # Used by the release job
     staging-profile-id: 96fdf4408765d
 
+- project:
+    name: jsonrpc-release-management
+    jobs:
+      - gerrit-release-merge
+
+    project: jsonrpc
+    project-name: jsonrpc
+
+    build-node: centos7-builder-2c-1g
+    mvn-settings: jsonrpc-settings
+
 - project:
     name: jsonrpc-sonar
     jobs: