X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fmdsal%2Fmdsal.yaml;h=d3f638763438586860fc07c3212603a4d3c7f27d;hb=786a9d445ebcf9c160808f60aab72a3051b4abcf;hp=35b16134787a5d9bbff6855ac7cbd9450b20107b;hpb=0673d0736a8df6f50fc1bdc58e8eda95fa99d388;p=releng%2Fbuilder.git

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 35b161347..d3f638763 100644
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -32,7 +32,7 @@
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-6.0.x
+    name: mdsal-7.0.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -44,8 +44,8 @@
 
     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"
@@ -64,7 +64,7 @@
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-5.0.x
+    name: mdsal-6.0.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -76,49 +76,14 @@
 
     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"
-    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-v4.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
-      - odl-maven-verify-jobs
-
-    project: mdsal
-    project-name: mdsal
-    branch: v4.0.x
-    stream: v4.0.x
-
-    mvn-settings: "mdsal-settings"
-    mvn-opts: "-Xmx2048m"
+    mvn-version: mvn36
     build-timeout: 90
 
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream}"
-    email-upstream: "[mdsal] [odlparent] [yangtools]"
     archive-artifacts: >
       **/*.prop
       **/*.log
@@ -140,6 +105,9 @@
 
     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