X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fjsonrpc%2Fjsonrpc.yaml;h=e28710c8a1fc2802515029aedffd752b0f53d3a4;hb=bba8956edff8bf2473b8c9c9dc9b3026f135872e;hp=66597758cbe5d76ee9b8dbf2b2e2c153522c2f5c;hpb=a62ddadf80b0f6c9abdb38c5ca07552e150b8a95;p=releng%2Fbuilder.git

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 66597758c..e28710c8a 100644
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -1,10 +1,10 @@
 ---
 - project:
-    name: jsonrpc-chlorine
+    name: jsonrpc-calcium
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-builder-2c-2g
           project-pattern: jsonrpc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/
           rtd-token: 04d31d4414734686d63f9b160e974fe5a18d031d
@@ -13,11 +13,9 @@
 
     project: "jsonrpc"
     project-name: "jsonrpc"
-    stream: chlorine
-    java-version: "openjdk17"
+    stream: calcium
     branch: "master"
     mvn-settings: "jsonrpc-settings"
-    build-node: centos8-builder-4c-4g
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"
     email-upstream: "[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]"
 
@@ -25,26 +23,22 @@
     staging-profile-id: 96fdf4408765d
 
 - project:
-    name: jsonrpc-sulfur
+    name: jsonrpc-potassium
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-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
+      - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
 
     project: "jsonrpc"
     project-name: "jsonrpc"
-    stream: sulfur
-    java-version: "openjdk11"
-    branch: "stable/sulfur"
+    stream: potassium
+    branch: "stable/potassium"
     mvn-settings: "jsonrpc-settings"
-    build-node: centos8-builder-4c-4g
-    mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"
     email-upstream: "[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]"
 
@@ -52,24 +46,45 @@
     staging-profile-id: 96fdf4408765d
 
 - project:
-    name: jsonrpc-phosphorus
+    name: jsonrpc-argon
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-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
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
     project: "jsonrpc"
     project-name: "jsonrpc"
-    stream: phosphorus
-    java-version: "openjdk11"
-    branch: "stable/phosphorus"
+    stream: argon
+    branch: "stable/argon"
+    mvn-settings: "jsonrpc-settings"
+    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-chlorine
+    jobs:
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":
+          build-node: centos8-builder-2c-2g
+          project-pattern: jsonrpc
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/
+          rtd-token: 04d31d4414734686d63f9b160e974fe5a18d031d
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
+
+    project: "jsonrpc"
+    project-name: "jsonrpc"
+    stream: chlorine
+    branch: "stable/chlorine"
     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]"
 
@@ -90,19 +105,13 @@
 - project:
     name: jsonrpc-sonar
     jobs:
-      - gerrit-maven-sonar
+      - odl-sonar-jobs-jdk17
 
     project: "jsonrpc"
     project-name: "jsonrpc"
-    java-version: "openjdk11"
     branch: "master"
-    mvn-version: mvn38
     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}"
 
 - project:
     name: jsonrpc-info