X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fmdsal%2Fmdsal.yaml;h=7b7c25a5c38ec9e62ae994fd951d98454510c757;hb=5375c3e0b818b0b8d816352329cef4a054f2598d;hp=7490dd565acf4fc90c189710a21e05fcdd9edf8b;hpb=cbf13450815f7ce1d1c080550686ac0243528c21;p=releng%2Fbuilder.git

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 7490dd565..7b7c25a5c 100644
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -1,42 +1,59 @@
 ---
 - project:
-    name: mdsal-oxygen
+    name: mdsal-master
     jobs:
-      - '{project-name}-distribution-check-{stream}':
-          mvn-version: 'mvn35'
       - '{project-name}-maven-javadoc-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
 
-    stream: oxygen
-    project: 'mdsal'
-    project-name: 'mdsal'
-    branch: 'master'
+    project: mdsal
+    project-name: mdsal
+    branch: master
+    stream: master
+
     mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
-    build-node: centos7-builder-8c-8g
-    build-timeout: 90
+    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-nitrogen
+    name: mdsal-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-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: nitrogen
+    stream: fluorine
     project: 'mdsal'
     project-name: 'mdsal'
-    branch: 'stable/nitrogen'
-    build-node: centos7-builder-8c-8g
+    branch: 'stable/fluorine'
     mvn-settings: 'mdsal-settings'
     mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
+    mvn-opts: '-Xmx2048m'
+    build-node: centos7-builder-8c-8g
+    build-timeout: 90
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
 
@@ -44,21 +61,28 @@
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-carbon
+    name: mdsal-oxygen
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-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: carbon
+    stream: oxygen
     project: 'mdsal'
     project-name: 'mdsal'
-    branch: 'stable/carbon'
-    build-node: centos7-builder-8c-8g
-    karaf-version: karaf3
+    branch: 'stable/oxygen'
     mvn-settings: 'mdsal-settings'
     mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
+    mvn-opts: '-Xmx2048m'
+    build-node: centos7-builder-8c-8g
+    build-timeout: 90
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
 
@@ -68,11 +92,21 @@
 - 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
+
     project: 'mdsal'
     project-name: 'mdsal'
     branch: 'master'
     build-node: centos7-builder-8c-8g
     mvn-settings: 'mdsal-settings'
     mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
-    mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
+    mvn-opts: '-Xmx2048m'
+
+- project:
+    name: mdsal-view
+    views:
+      - project-view
+    project-name: mdsal