Merge "Removed the distribution check job"

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

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 3d71f6402ce86ab145ee211cec811b78ef0ec054..002fbb415246ee1c1003b6f5ac2e9ba70597eab7 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,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
@@ -52,6 +52,7 @@
     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]'
@@ -84,38 +85,7 @@
 
     mvn-settings: 'mdsal-settings'
     mvn-opts: '-Xmx2048m'
-
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[mdsal] [odlparent] [yangtools]'
-    archive-artifacts: >
-        **/*.prop
-        **/*.log
-        **/target/surefire-reports/*-output.txt
-        **/target/failsafe-reports/failsafe-summary.xml
-        **/hs_err_*.log
-        **/target/feature/feature.xml
-
-    # Used by the release job
-    staging-profile-id: a674173c7b29d
-
-- project:
-    name: mdsal-3.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-verify-jobs
-
-    project: mdsal
-    project-name: mdsal
-    branch: v3.0.x
-    stream: v3.0.x
-
-    mvn-settings: 'mdsal-settings'
-    mvn-opts: '-Xmx2048m'
+    build-timeout: 90
 
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
@@ -142,11 +112,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