X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fserviceutils%2Fserviceutils.yaml;h=4926281f72a926a72567ddf60d22f7239b45cf9a;hb=0673d0736a8df6f50fc1bdc58e8eda95fa99d388;hp=c28579e5c807b650ebb08c934e12705243934f3d;hpb=7d48177bafbb4c3beb042da423f77bfbc912364c;p=releng%2Fbuilder.git

diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
index c28579e5c..4926281f7 100644
--- a/jjb/serviceutils/serviceutils.yaml
+++ b/jjb/serviceutils/serviceutils.yaml
@@ -1,39 +1,99 @@
 ---
 - project:
-    name: serviceutils
+    name: serviceutils-silicon
     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
-
-    stream:
-      - sodium:
-          branch: 'master'
-      - neon:
-          branch: 'stable/neon'
-      - fluorine:
-          branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-          disable-job: true
-
-    project: 'serviceutils'
-    project-name: 'serviceutils'
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
+
+    branch: "master"
+    stream: silicon
+
+    project: "serviceutils"
+    project-name: "serviceutils"
+    build-node: centos7-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]"
+
+    # Used by the release job
+    staging-profile-id: 12cc4ba8bf01ba
+
+- project:
+    name: serviceutils-aluminium
+    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-jdk11
+      - odl-maven-verify-jobs
+
+    branch: "stable/aluminium"
+    stream: aluminium
+
+    project: "serviceutils"
+    project-name: "serviceutils"
+    build-node: centos7-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]"
+
+    # Used by the release job
+    staging-profile-id: 12cc4ba8bf01ba
+
+- project:
+    name: serviceutils-magnesium
+    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-jdk11
+      - odl-maven-verify-jobs
+
+    branch: "stable/magnesium"
+    stream: magnesium
+
+    project: "serviceutils"
+    project-name: "serviceutils"
     build-node: centos7-builder-2c-2g
-    mvn-settings: 'serviceutils-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    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
@@ -43,12 +103,26 @@
     jobs:
       - gerrit-maven-sonar
 
-    project: 'serviceutils'
-    project-name: 'serviceutils'
-    branch: 'master'
+    project: "serviceutils"
+    project-name: "serviceutils"
+    branch: "master"
     build-node: centos7-builder-4c-4g
-    mvn-settings: 'serviceutils-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: "openjdk11"
+    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-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: serviceutils
+    project-name: serviceutils
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: serviceutils-view