Update Java version & build node for Sonar jobs

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

diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
index f6d1616508c060a7935deb2d830177d7c1d20121..7bba04192cd5cc7209a432c20272c3b8210e2ec2 100644 (file)
--- a/jjb/serviceutils/serviceutils.yaml
+++ b/jjb/serviceutils/serviceutils.yaml
@@ -1,145 +1,128 @@
 ---
 - project:
-    name: serviceutils-magnesium
+    name: serviceutils-chlorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: serviceutils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
           rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
-    branch: 'master'
-    stream: magnesium
+    branch: "master"
+    stream: chlorine
 
-    project: 'serviceutils'
-    project-name: 'serviceutils'
-    build-node: centos7-builder-2c-2g
-    mvn-settings: 'serviceutils-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "serviceutils"
+    project-name: "serviceutils"
+    build-node: centos8-builder-2c-2g
+    java-version: "openjdk17"
+    mvn-settings: "serviceutils-settings"
     build-timeout: 90
     dependencies: >
-        controller-merge-{stream},
-        yangtools-merge-{stream},
-        odlparent-merge-{stream},
-        infrautils-merge-{stream}
-    email-upstream: '[serviceutils] [controller] [yangtools] [odlparent] [infrautils]'
-
+      controller-merge-{stream},
+      yangtools-merge-{stream},
+      odlparent-merge-{stream},
+      infrautils-merge-{stream}
+    email-upstream: "[serviceutils] [controller] [yangtools] [odlparent] [infrautils]"
     # Used by the release job
     staging-profile-id: 12cc4ba8bf01ba
 
 - project:
-    name: serviceutils-sodium
+    name: serviceutils-sulfur
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: serviceutils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
           rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17
 
-    branch: 'stable/sodium'
-    stream: sodium
+    branch: "stable/sulfur"
+    stream: sulfur
 
-    project: 'serviceutils'
-    project-name: 'serviceutils'
-    build-node: centos7-builder-2c-2g
-    mvn-settings: 'serviceutils-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "serviceutils"
+    project-name: "serviceutils"
+    build-node: centos8-builder-2c-2g
+    java-version: "openjdk11"
+    mvn-settings: "serviceutils-settings"
+    mvn-opts: "-Xmx1024m"
     build-timeout: 90
     dependencies: >
-        controller-merge-{stream},
-        yangtools-merge-{stream},
-        odlparent-merge-{stream},
-        infrautils-merge-{stream}
-    email-upstream: '[serviceutils] [controller] [yangtools] [odlparent] [infrautils]'
-
+      controller-merge-{stream},
+      yangtools-merge-{stream},
+      odlparent-merge-{stream},
+      infrautils-merge-{stream}
+    email-upstream: "[serviceutils] [controller] [yangtools] [odlparent] [infrautils]"
     # Used by the release job
     staging-profile-id: 12cc4ba8bf01ba
 
 - project:
-    name: serviceutils-neon
+    name: serviceutils-phosphorus
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: serviceutils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
           rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    branch: 'stable/neon'
-    stream: neon
+    branch: "stable/phosphorus"
+    stream: phosphorus
 
-    project: 'serviceutils'
-    project-name: 'serviceutils'
+    project: "serviceutils"
+    project-name: "serviceutils"
     build-node: centos7-builder-2c-2g
-    mvn-settings: 'serviceutils-settings'
-    mvn-opts: '-Xmx1024m'
+    java-version: "openjdk11"
+    mvn-settings: "serviceutils-settings"
+    mvn-opts: "-Xmx1024m"
     build-timeout: 90
     dependencies: >
-        controller-merge-{stream},
-        yangtools-merge-{stream},
-        odlparent-merge-{stream},
-        infrautils-merge-{stream}
-    email-upstream: '[serviceutils] [controller] [yangtools] [odlparent] [infrautils]'
-
+      controller-merge-{stream},
+      yangtools-merge-{stream},
+      odlparent-merge-{stream},
+      infrautils-merge-{stream}
+    email-upstream: "[serviceutils] [controller] [yangtools] [odlparent] [infrautils]"
     # Used by the release job
     staging-profile-id: 12cc4ba8bf01ba
 
 - project:
-    name: serviceutils-fluorine
+    name: serviceutils-sonar
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
-          build-node: centos7-builder-2c-2g
-          project-pattern: serviceutils
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
-          rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
+      - gerrit-maven-sonar
 
-    branch: 'stable/fluorine'
-    stream: fluorine
-
-    project: 'serviceutils'
-    project-name: 'serviceutils'
-    build-node: centos7-builder-2c-2g
-    mvn-settings: 'serviceutils-settings'
-    mvn-opts: '-Xmx1024m'
-    build-timeout: 90
-    dependencies: >
-        controller-merge-{stream},
-        yangtools-merge-{stream},
-        odlparent-merge-{stream},
-        infrautils-merge-{stream}
-    email-upstream: '[serviceutils] [controller] [yangtools] [odlparent] [infrautils]'
-
-    # Used by the release job
-    staging-profile-id: 12cc4ba8bf01ba
+    project: "serviceutils"
+    project-name: "serviceutils"
+    branch: "master"
+    build-node: centos8-builder-4c-4g
+    java-version: "openjdk17"
+    mvn-version: mvn38
+    mvn-settings: "serviceutils-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: serviceutils-sonar
+    name: serviceutils-info
     jobs:
-      - gerrit-maven-sonar
-
-    project: 'serviceutils'
-    project-name: 'serviceutils'
-    branch: 'master'
-    build-node: centos7-builder-4c-4g
-    mvn-settings: 'serviceutils-settings'
-    mvn-opts: '-Xmx1024m'
+      - gerrit-info-yaml-verify
+    project: serviceutils
+    project-name: serviceutils
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: serviceutils-view