X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdaexim%2Fdaexim.yaml;h=9add50d70d8b41ce037a2b56247cda7b59d0c53e;hb=cc7db5973fe564ef8459671aa5f9111e9b2d4ebb;hp=fae0e5c14d3931b68672bde7bf9b01542a81d02f;hpb=0abaee571f249a9da5396f5d44cae9350f2fbf2a;p=releng%2Fbuilder.git

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index fae0e5c14..9add50d70 100644
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -1,34 +1,36 @@
 ---
 - project:
-    name: daexim-silicon
+    name: daexim-sulfur
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":
           build-node: centos7-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-verify-jobs-jdk17
 
-    project: 'daexim'
-    project-name: 'daexim'
-    stream: silicon
-    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]'
+    project: "daexim"
+    project-name: "daexim"
+    stream: sulfur
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "daexim-settings"
+    build-node: centos8-builder-4c-4g
+    mvn-opts: "-Xmx1024m"
+    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-aluminium
+    name: daexim-phosphorus
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: daexim
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
@@ -36,24 +38,24 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    project: 'daexim'
-    project-name: 'daexim'
-    stream: aluminium
-    branch: 'stable/aluminium'
-    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]'
+    project: "daexim"
+    project-name: "daexim"
+    stream: phosphorus
+    branch: "stable/phosphorus"
+    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]"
 
     # Used by the release job
     staging-profile-id: 96e4dade34bd7
 
 - project:
-    name: daexim-magnesium
+    name: daexim-silicon
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: daexim
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
@@ -61,39 +63,15 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    project: 'daexim'
-    project-name: 'daexim'
-    stream: magnesium
-    branch: 'stable/magnesium'
-    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]'
-
-    # Used by the release job
-    staging-profile-id: 96e4dade34bd7
-
-- project:
-    name: daexim-sodium
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
-          build-node: centos7-builder-2c-2g
-          project-pattern: daexim
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
-          rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    project: 'daexim'
-    project-name: 'daexim'
-    stream: sodium
-    branch: 'stable/sodium'
-    mvn-settings: 'daexim-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
+    project: "daexim"
+    project-name: "daexim"
+    stream: silicon
+    branch: "stable/silicon"
+    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]"
 
     # Used by the release job
     staging-profile-id: 96e4dade34bd7
@@ -103,16 +81,16 @@
     jobs:
       - gerrit-maven-sonar
 
-    project: 'daexim'
-    project-name: 'daexim'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'daexim-settings'
-    mvn-opts: '-Xmx1024m'
+    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}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
     name: daexim-info