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

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 244360c83..d3f638763 100644
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -2,9 +2,7 @@
 - project:
     name: mdsal-master
     jobs:
-      - 'gerrit-release-merge':
-          build-node: centos7-builder-2c-2g
-      - '{project-name}-rtd-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/
@@ -17,26 +15,26 @@
     branch: master
     stream: master
 
-    java-version: 'openjdk11'
-    mvn-settings: 'mdsal-settings'
+    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
+      **/*.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
+    name: mdsal-7.0.x
     jobs:
-      - '{project-name}-rtd-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/
@@ -46,29 +44,29 @@
 
     project: mdsal
     project-name: mdsal
-    branch: 6.0.x
-    stream: 6.0.x
+    branch: 7.0.x
+    stream: 7.0.x
 
-    java-version: 'openjdk11'
-    mvn-settings: 'mdsal-settings'
+    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
+      **/*.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
+    name: mdsal-6.0.x
     jobs:
-      - '{project-name}-rtd-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/
@@ -78,59 +76,38 @@
 
     project: mdsal
     project-name: mdsal
-    branch: 5.0.x
-    stream: 5.0.x
+    branch: 6.0.x
+    stream: 6.0.x
 
-    java-version: 'openjdk11'
-    mvn-settings: 'mdsal-settings'
-    mvn-opts: '-Xmx2048m'
+    java-version: "openjdk11"
+    mvn-settings: "mdsal-settings"
+    mvn-version: mvn36
     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
+      **/*.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-v4.0.x
+    name: mdsal-release-management
     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
-      - odl-maven-verify-jobs
+      - gerrit-release-merge
 
     project: mdsal
     project-name: mdsal
-    branch: v4.0.x
-    stream: v4.0.x
-
-    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
+    build-node: centos7-builder-2c-1g
+    mvn-settings: mdsal-settings
+    # Needs to be rather long until we sort out the performance of
+    # https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/
+    build-timeout: 120
 
 - project:
     name: mdsal-sonar
@@ -138,20 +115,22 @@
       - 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'
-    java-version: 'openjdk11'
-    mvn-settings: 'mdsal-settings'
-    mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
-    mvn-opts: '-Xmx2048m'
+          sonar-mvn-goal: >
+            jacoco:report -Djacoco.dataFile=$WORKSPACE/target/jacoco.exec
+            sonar:sonar
+
+    project: "mdsal"
+    project-name: "mdsal"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "mdsal-settings"
+    mvn-goals: "-Dmaven.compile.fork=true clean deploy -Dintegrationtests"
+    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}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
     name: mdsal-info