X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fjsonrpc%2Fjsonrpc.yaml;h=6bdd54d834f279b5f1641dc7568c8813fd3c36a3;hb=e79310187ca46431a583a81e91cb83657fde8327;hp=9507f7afcee0bcc18306581682140ddb35d800ea;hpb=7e4e61a16d62f5f8e34fdea2ce9ace0f9fe7b417;p=releng%2Fbuilder.git

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 9507f7afc..6bdd54d83 100644
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -1,20 +1,24 @@
 ---
 - project:
-    name: jsonrpc-magnesium
+    name: jsonrpc-aluminium
     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
+      - gerrit-release-merge
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
-    stream: magnesium
+    stream: aluminium
+    java-version: 'openjdk11'
     branch: 'master'
     mvn-settings: 'jsonrpc-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
 
@@ -22,21 +26,24 @@
     staging-profile-id: 96fdf4408765d
 
 - project:
-    name: jsonrpc-sodium
+    name: jsonrpc-magnesium
     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'
+    stream: magnesium
+    java-version: 'openjdk11'
+    branch: 'stable/magnesium'
     mvn-settings: 'jsonrpc-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
 
@@ -44,7 +51,7 @@
     staging-profile-id: 96fdf4408765d
 
 - project:
-    name: jsonrpc-neon
+    name: jsonrpc-sodium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -52,30 +59,14 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/
           rtd-token: 04d31d4414734686d63f9b160e974fe5a18d031d
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
-    stream: neon
-    branch: 'stable/neon'
-    mvn-settings: 'jsonrpc-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    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-fluorine
-    jobs:
-      - odl-maven-jobs
-
-    project: 'jsonrpc'
-    project-name: 'jsonrpc'
-    stream: fluorine
-    branch: 'stable/fluorine'
+    stream: sodium
+    branch: 'stable/sodium'
     mvn-settings: 'jsonrpc-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
 
@@ -91,7 +82,20 @@
     project-name: 'jsonrpc'
     branch: 'master'
     mvn-settings: 'jsonrpc-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    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}'
+
+- project:
+    name: jsonrpc-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: jsonrpc
+    project-name: jsonrpc
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: jsonrpc-view