X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fmdsal%2Fmdsal.yaml;h=251842596bb09ce92d0eb403a3ded8130c083dda;hb=410bdc83251779f7b5ef615452b1e15350be4b58;hp=8b97b0c4efef4abd76b4143ece4d1ffeb6681a5e;hpb=e6d7f315bb47c0546035b16b4dbe89930bb18699;p=releng%2Fbuilder.git

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 8b97b0c4ef..251842596b 100644
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -2,7 +2,8 @@
 - project:
     name: mdsal-master
     jobs:
-      - '{project-name}-maven-javadoc-jobs'
+      - '{project-name}-maven-javadoc-jobs':
+          disable-job: true
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: mdsal
@@ -32,12 +33,10 @@
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-fluorine
+    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
@@ -45,28 +44,35 @@
           rtd-token: a56d6212dd3de3eef12642affe8a6100cc8bc002
       - odl-maven-jobs
 
-    stream: fluorine
-    project: 'mdsal'
-    project-name: 'mdsal'
-    branch: 'stable/fluorine'
+    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
 
 - project:
-    name: mdsal-oxygen
+    name: mdsal-fluorine
     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
@@ -74,10 +80,10 @@
           rtd-token: a56d6212dd3de3eef12642affe8a6100cc8bc002
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'mdsal'
     project-name: 'mdsal'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     mvn-settings: 'mdsal-settings'
     mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
     mvn-opts: '-Xmx2048m'
@@ -85,7 +91,6 @@
     build-timeout: 90
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
-    disable-job: true
 
     # Used by the release job
     staging-profile-id: a674173c7b29d
@@ -97,6 +102,7 @@
           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'