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 d9ac0887c9e1c2eaaf38922812c891152be53851..354db8a4bde0745a0c49c539ef5bc76c13801fa6 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: jsonrpc-magnesium
+    name: jsonrpc-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -14,7 +14,7 @@
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
-    stream: magnesium
+    stream: aluminium
     java-version: 'openjdk11'
     branch: 'master'
     mvn-settings: 'jsonrpc-settings'
@@ -26,20 +26,22 @@
     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'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
@@ -49,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
@@ -61,8 +63,8 @@
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
-    stream: neon
-    branch: 'stable/neon'
+    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}'