Feat: Branch cut stable/calcium

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

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 39aec0c4f71385ae3edf11d8bb6ac266366b9e28..2f7431d59fc0407f5064dfc6bd74968d4afa566f 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -1,23 +1,21 @@
 ---
 - project:
-    name: jsonrpc-sulfur
+    name: jsonrpc-scandium
     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"
+    stream: scandium
     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]"
 
@@ -25,24 +23,22 @@
     staging-profile-id: 96fdf4408765d
 
 - project:
-    name: jsonrpc-phosphorus
+    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
-      - 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: calcium
+    branch: "stable/calcium"
     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]"
 
@@ -50,24 +46,45 @@
     staging-profile-id: 96fdf4408765d
 
 - project:
-    name: jsonrpc-silicon
+    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: silicon
-    java-version: "openjdk11"
-    branch: "stable/silicon"
+    stream: potassium
+    branch: "stable/potassium"
+    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-argon
+    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: argon
+    branch: "stable/argon"
     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]"
 
@@ -88,18 +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-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