X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fjsonrpc%2Fjsonrpc.yaml;h=c1775f058dd1ed1bfe093851452451dd9e74e9f8;hb=232a18be06afa78543dd8e833559e8088fe0baed;hp=6bdd54d834f279b5f1641dc7568c8813fd3c36a3;hpb=751859fe7ee4fbce8042d983c27bd5a0f28f1843;p=releng%2Fbuilder.git

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 6bdd54d83..c1775f058 100644
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -1,35 +1,34 @@
 ---
 - project:
-    name: jsonrpc-aluminium
+    name: jsonrpc-silicon
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-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
-      - gerrit-release-merge
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    project: 'jsonrpc'
-    project-name: 'jsonrpc'
-    stream: aluminium
-    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]'
+    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-magnesium
+    name: jsonrpc-aluminium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-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/
@@ -37,56 +36,70 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    project: 'jsonrpc'
-    project-name: 'jsonrpc'
-    stream: magnesium
-    java-version: 'openjdk11'
-    branch: 'stable/magnesium'
-    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]'
+    project: "jsonrpc"
+    project-name: "jsonrpc"
+    stream: aluminium
+    java-version: "openjdk11"
+    branch: "stable/aluminium"
+    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-sodium
+    name: jsonrpc-magnesium
     jobs:
-      - '{project-name}-rtd-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
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    project: 'jsonrpc'
-    project-name: 'jsonrpc'
-    stream: sodium
-    branch: 'stable/sodium'
-    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]'
+    project: "jsonrpc"
+    project-name: "jsonrpc"
+    stream: magnesium
+    java-version: "openjdk11"
+    branch: "stable/magnesium"
+    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-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:
       - gerrit-maven-sonar
 
-    project: 'jsonrpc'
-    project-name: 'jsonrpc'
-    branch: 'master'
-    mvn-settings: 'jsonrpc-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "jsonrpc"
+    project-name: "jsonrpc"
+    java-version: "openjdk11"
+    branch: "master"
+    mvn-settings: "jsonrpc-settings"
+    mvn-opts: "-Xmx1024m"
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
     name: jsonrpc-info