X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fmdsal%2Fmdsal.yaml;h=93012b2b5409ccf099ff440bfcea8118c4884c1b;hb=148d06a662e05dcaf899ab406f667befbf95c6ef;hp=42c96da4eca5b3d3195911c3d172d30e2c0cbfff;hpb=ebf97a45fa6d937ed300d4235b3eb7776f4876fa;p=releng%2Fbuilder.git

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 42c96da4e..93012b2b5 100644
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -2,7 +2,8 @@
 - project:
     name: mdsal-master
     jobs:
-      - 'gerrit-release-merge'
+      - 'gerrit-release-merge':
+          build-node: centos7-builder-2c-2g
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: mdsal
@@ -18,10 +19,9 @@
 
     java-version: 'openjdk11'
     mvn-settings: 'mdsal-settings'
-    mvn-opts: '-Xmx2048m'
+    mvn-version: mvn36
+    build-timeout: 90
 
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[mdsal] [odlparent] [yangtools]'
     archive-artifacts: >
         **/*.prop
         **/*.log
@@ -34,23 +34,25 @@
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-v4.0.x
+    name: mdsal-5.0.x
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: mdsal
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-mdsal/44052/
           rtd-token: a56d6212dd3de3eef12642affe8a6100cc8bc002
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     project: mdsal
     project-name: mdsal
-    branch: v4.0.x
-    stream: v4.0.x
+    branch: 5.0.x
+    stream: 5.0.x
 
+    java-version: 'openjdk11'
     mvn-settings: 'mdsal-settings'
     mvn-opts: '-Xmx2048m'
+    build-timeout: 90
 
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
@@ -66,7 +68,7 @@
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-3.0.x
+    name: mdsal-v4.0.x
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -78,11 +80,12 @@
 
     project: mdsal
     project-name: mdsal
-    branch: v3.0.x
-    stream: v3.0.x
+    branch: v4.0.x
+    stream: v4.0.x
 
     mvn-settings: 'mdsal-settings'
     mvn-opts: '-Xmx2048m'
+    build-timeout: 90
 
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
@@ -114,6 +117,10 @@
     mvn-settings: 'mdsal-settings'
     mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
     mvn-opts: '-Xmx2048m'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: mdsal-view