Merge "Move sxp Sonar scan to Sonarcloud"

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

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 2e042a1161cccc709bd7827f86c1a653c90d1b0b..354db8a4bde0745a0c49c539ef5bc76c13801fa6 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -1,22 +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
       - gerrit-release-merge
-      - odl-maven-jobs
+      - 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]'
 
@@ -24,22 +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]'
 
@@ -47,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
@@ -59,28 +63,10 @@
 
     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
-      - odl-maven-verify-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]'
 
@@ -96,7 +82,7 @@
     project-name: 'jsonrpc'
     branch: 'master'
     mvn-settings: 'jsonrpc-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
 
 - project:
     name: jsonrpc-view