X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdaexim%2Fdaexim.yaml;h=92d3a94b52cc1fe4540d8c0b1d8e038b3df40a61;hb=309f2c1cdb95fc43d9e31ae28b6b2418f15f24db;hp=87482709aa1ad7b309dd8d94fbbda903ea1326a4;hpb=74c417fa16ab546b7ce163c0eb77447234ac5a3a;p=releng%2Fbuilder.git

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index 87482709a..92d3a94b5 100644
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -1,23 +1,21 @@
 ---
 - project:
-    name: daexim-silicon
+    name: daexim-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: daexim
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
           rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
     project: "daexim"
     project-name: "daexim"
-    stream: silicon
+    stream: scandium
     branch: "master"
-    java-version: "openjdk11"
     mvn-settings: "daexim-settings"
-    mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
     email-upstream: "[daexim] [odlparent] [yangtools] [controller]"
 
@@ -25,24 +23,22 @@
     staging-profile-id: 96e4dade34bd7
 
 - project:
-    name: daexim-aluminium
+    name: daexim-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: daexim
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
           rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
     project: "daexim"
     project-name: "daexim"
-    stream: aluminium
-    branch: "stable/aluminium"
-    java-version: "openjdk11"
+    stream: calcium
+    branch: "stable/calcium"
     mvn-settings: "daexim-settings"
-    mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
     email-upstream: "[daexim] [odlparent] [yangtools] [controller]"
 
@@ -50,24 +46,45 @@
     staging-profile-id: 96e4dade34bd7
 
 - project:
-    name: daexim-magnesium
+    name: daexim-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: daexim
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
           rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
     project: "daexim"
     project-name: "daexim"
-    stream: magnesium
-    branch: "stable/magnesium"
-    java-version: "openjdk11"
+    stream: potassium
+    branch: "stable/potassium"
+    mvn-settings: "daexim-settings"
+    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
+    email-upstream: "[daexim] [odlparent] [yangtools] [controller]"
+
+    # Used by the release job
+    staging-profile-id: 96e4dade34bd7
+
+- project:
+    name: daexim-argon
+    jobs:
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":
+          build-node: centos8-builder-2c-2g
+          project-pattern: daexim
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
+          rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
+
+    project: "daexim"
+    project-name: "daexim"
+    stream: argon
+    branch: "stable/argon"
     mvn-settings: "daexim-settings"
-    mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
     email-upstream: "[daexim] [odlparent] [yangtools] [controller]"
 
@@ -77,18 +94,13 @@
 - project:
     name: daexim-sonar
     jobs:
-      - gerrit-maven-sonar
+      - odl-sonar-jobs-jdk17
 
     project: "daexim"
     project-name: "daexim"
     branch: "master"
-    java-version: "openjdk11"
     mvn-settings: "daexim-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: daexim-info