Merge "Skip SFT during mdsal-sonar"

diff --combined jjb/mdsal/mdsal.yaml
index 4c28ccca2032b3ee0faf93a9fc783dd23ab3caab,57a4cb46bb3dcb7ea000dfd31e8922cbe921505c..251842596bb09ce92d0eb403a3ded8130c083dda
--- 1/jjb/mdsal/mdsal.yaml
--- 2/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@@ -2,8 -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
@@@ -33,10 -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
@@@ -44,35 -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
@@@ -80,10 -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'
@@@ -102,6 -96,7 +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'