Merge "Skip SFT during mdsal-sonar"

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

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 84cdd3ebc694a0326208cf5caed2ea4f04823f9d..251842596bb09ce92d0eb403a3ded8130c083dda 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -3,7 +3,7 @@
     name: mdsal-master
     jobs:
       - '{project-name}-maven-javadoc-jobs':
-          mvn-version: 'mvn33'
+          disable-job: true
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: mdsal
@@ -33,12 +33,10 @@
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-neon
+    name: mdsal-3.0.x
     jobs:
-      - '{project-name}-distribution-check-{stream}':
-          mvn-version: 'mvn35'
       - '{project-name}-maven-javadoc-jobs':
-          mvn-version: 'mvn33'
+          disable-job: true
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: mdsal
@@ -46,17 +44,23 @@
           rtd-token: a56d6212dd3de3eef12642affe8a6100cc8bc002
       - odl-maven-jobs
 
-    stream: neon
-    project: 'mdsal'
-    project-name: 'mdsal'
-    branch: 'v2.6.x'
+    project: mdsal
+    project-name: mdsal
+    branch: v3.0.x
+    stream: v3.0.x
+
     mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
     mvn-opts: '-Xmx2048m'
-    build-node: centos7-builder-8c-8g
-    build-timeout: 90
+
     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
@@ -68,6 +72,7 @@
           mvn-version: 'mvn35'
       - '{project-name}-maven-javadoc-jobs':
           mvn-version: 'mvn33'
+          disable-job: true
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: mdsal
@@ -90,39 +95,15 @@
     # Used by the release job
     staging-profile-id: a674173c7b29d
 
-- project:
-    name: mdsal-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}':
-          mvn-version: 'mvn35'
-      - '{project-name}-maven-javadoc-jobs':
-          mvn-version: 'mvn33'
-      - '{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
-
-    stream: oxygen
-    project: 'mdsal'
-    project-name: 'mdsal'
-    branch: 'stable/oxygen'
-    mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
-    mvn-opts: '-Xmx2048m'
-    build-node: centos7-builder-8c-8g
-    build-timeout: 90
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[mdsal] [odlparent] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a674173c7b29d
-
 - project:
     name: mdsal-sonar
     jobs:
-      - gerrit-maven-sonar
+      - gerrit-maven-sonar:
+          mvn-params: >
+            -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
+            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
+            -Dskip.karaf.featureTest=true
+
     project: 'mdsal'
     project-name: 'mdsal'
     branch: 'master'
@@ -131,8 +112,8 @@
     mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
     mvn-opts: '-Xmx2048m'
 
-- view:
-    name: mdsal
-    description: 'List of mdsal jobs'
-    regex: '^mdsal-.*'
-    <<: *releng_view_common
+- project:
+    name: mdsal-view
+    views:
+      - project-view
+    project-name: mdsal