Merge "Move unimgr Sonar scan to Sonarcloud"

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

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index d327d12b994c152b34a651016d1b9ca89e5ff16b..244360c83a3893537fad44f4a817595d2965d328 100644 (file)
--- 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,7 +19,8 @@
 
     java-version: 'openjdk11'
     mvn-settings: 'mdsal-settings'
-    mvn-opts: '-Xmx2048m'
+    mvn-version: mvn36
+    build-timeout: 90
 
     archive-artifacts: >
         **/*.prop
@@ -32,7 +34,7 @@
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-5.0.x
+    name: mdsal-6.0.x
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -44,15 +46,14 @@
 
     project: mdsal
     project-name: mdsal
-    branch: 5.0.x
-    stream: 5.0.x
+    branch: 6.0.x
+    stream: 6.0.x
 
     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
@@ -65,23 +66,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]'
@@ -97,7 +100,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
@@ -109,11 +112,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]'
@@ -140,11 +144,23 @@
     project: 'mdsal'
     project-name: 'mdsal'
     branch: 'master'
-    build-node: centos7-builder-8c-8g
     java-version: 'openjdk11'
     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-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: mdsal
+    project-name: mdsal
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: mdsal-view