X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fmdsal%2Fmdsal.yaml;h=690c605548118eeb1f1260c5d4d4244453eb6927;hb=e7f90d0bebac6940b204fae31e348b978cff5047;hp=18fe76b5ac6338766953a87d05c1ae4eb561ffab;hpb=eb558d21803ca15cd9fc0c788e8f420494f8feb3;p=releng%2Fbuilder.git

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 18fe76b5a..690c60554 100644
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -7,18 +7,18 @@
           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
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
     project: mdsal
     project-name: mdsal
     branch: master
     stream: master
 
-    java-version: "openjdk11"
+    build-node: centos8-builder-4c-4g
+    java-version: "openjdk17"
     mvn-settings: "mdsal-settings"
-    mvn-version: mvn36
-    build-timeout: 90
+    build-timeout: 60
 
     archive-artifacts: >
       **/*.prop
@@ -32,25 +32,25 @@
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-6.0.x
+    name: mdsal-10.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
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
     project: mdsal
     project-name: mdsal
-    branch: 6.0.x
-    stream: 6.0.x
+    branch: 10.0.x
+    stream: 10.0.x
 
-    java-version: "openjdk11"
+    build-node: centos8-builder-4c-4g
+    java-version: "openjdk17"
     mvn-settings: "mdsal-settings"
-    mvn-version: mvn36
-    build-timeout: 90
+    build-timeout: 60
 
     archive-artifacts: >
       **/*.prop
@@ -64,7 +64,7 @@
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-5.0.x
+    name: mdsal-9.0.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -73,19 +73,18 @@
           rtd-token: a56d6212dd3de3eef12642affe8a6100cc8bc002
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17:
+          build-node: centos8-builder-4c-4g
 
     project: mdsal
     project-name: mdsal
-    branch: 5.0.x
-    stream: 5.0.x
+    branch: 9.0.x
+    stream: 9.0.x
 
     java-version: "openjdk11"
     mvn-settings: "mdsal-settings"
-    mvn-opts: "-Xmx2048m"
-    build-timeout: 90
+    build-timeout: 60
 
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream}"
-    email-upstream: "[mdsal] [odlparent] [yangtools]"
     archive-artifacts: >
       **/*.prop
       **/*.log
@@ -98,27 +97,26 @@
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-v4.0.x
+    name: mdsal-8.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-jobs-jdk11
       - odl-maven-verify-jobs
 
     project: mdsal
     project-name: mdsal
-    branch: v4.0.x
-    stream: v4.0.x
+    branch: 8.0.x
+    stream: 8.0.x
 
+    java-version: "openjdk11"
     mvn-settings: "mdsal-settings"
-    mvn-opts: "-Xmx2048m"
-    build-timeout: 90
+    mvn-version: mvn36
+    build-timeout: 60
 
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream}"
-    email-upstream: "[mdsal] [odlparent] [yangtools]"
     archive-artifacts: >
       **/*.prop
       **/*.log
@@ -140,6 +138,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
@@ -147,16 +148,20 @@
       - gerrit-maven-sonar:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
-            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
             -Dskip.karaf.featureTest=true
+          sonar-mvn-goal: >
+            jacoco:report -Djacoco.dataFile=$WORKSPACE/target/jacoco.exec
+            sonar:sonar
 
     project: "mdsal"
     project-name: "mdsal"
     branch: "master"
-    java-version: "openjdk11"
+    build-node: centos8-builder-4c-4g
+    java-version: "openjdk17"
+    mvn-version: mvn38
     mvn-settings: "mdsal-settings"
-    mvn-goals: "-Dmaven.compile.fork=true clean deploy -Dintegrationtests"
-    mvn-opts: "-Xmx2048m"
+    mvn-goals: "clean deploy"
+    mvn-opts: "-Dintegrationtests"
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-api-token: "{sonarcloud_api_token}"