X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fmdsal%2Fmdsal.yaml;h=244360c83a3893537fad44f4a817595d2965d328;hb=df6379a1c71fa46278ea50a45747347c5460ea6f;hp=8eec4af4427b170079100614c82b58586e324221;hpb=05ac2c55032ba988df52a0c514915693ba5f5bfe;p=releng%2Fbuilder.git

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 8eec4af44..244360c83 100644
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -1,58 +1,133 @@
 ---
 - project:
-    name: mdsal-fluorine
+    name: mdsal-master
     jobs:
-      - '{project-name}-distribution-check-{stream}':
-          mvn-version: 'mvn35'
-      - '{project-name}-maven-javadoc-jobs':
-          mvn-version: 'mvn33'
+      - 'gerrit-release-merge':
+          build-node: centos7-builder-2c-2g
       - '{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-jobs-jdk11
+      - odl-maven-verify-jobs
 
-    stream: fluorine
-    project: 'mdsal'
-    project-name: 'mdsal'
-    branch: 'master'
+    project: mdsal
+    project-name: mdsal
+    branch: master
+    stream: master
+
+    java-version: 'openjdk11'
     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
+    mvn-version: mvn36
+    build-timeout: 90
+
+    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-6.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-jdk11
+      - odl-maven-verify-jobs
+
+    project: mdsal
+    project-name: mdsal
+    branch: 6.0.x
+    stream: 6.0.x
+
+    java-version: 'openjdk11'
+    mvn-settings: 'mdsal-settings'
+    mvn-version: mvn36
+    build-timeout: 90
+
+    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-5.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-jdk11
+      - odl-maven-verify-jobs
+
+    project: mdsal
+    project-name: mdsal
+    branch: 5.0.x
+    stream: 5.0.x
+
+    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]'
+    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-v4.0.x
     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
+      - odl-maven-verify-jobs
+
+    project: mdsal
+    project-name: mdsal
+    branch: v4.0.x
+    stream: v4.0.x
 
-    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 -XX:MaxPermSize=1024m'
-    build-node: centos7-builder-8c-8g
+    mvn-opts: '-Xmx2048m'
     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
@@ -60,17 +135,35 @@
 - 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'
-    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 -XX:MaxPermSize=1024m'
+    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
 
-- view:
-    name: mdsal
-    description: 'List of mdsal jobs'
-    regex: '^mdsal-.*'
-    <<: *releng_view_common
+- project:
+    name: mdsal-view
+    views:
+      - project-view
+    project-name: mdsal