Feat: switch default build-node to centos8-4c-4g

[releng/builder.git] / jjb / mdsal / mdsal.yaml

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 18fe76b5ac6338766953a87d05c1ae4eb561ffab..2e3ec821c936a9188cdd6767649b5f998bdcb399 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -3,22 +3,21 @@
     name: mdsal-master
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-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: master
     stream: master
 
-    java-version: "openjdk11"
+    java-version: "openjdk17"
     mvn-settings: "mdsal-settings"
-    mvn-version: mvn36
-    build-timeout: 90
+    build-timeout: 60
 
     archive-artifacts: >
       **/*.prop
@@ -32,25 +31,24 @@
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-6.0.x
+    name: mdsal-11.0.x
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-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: 11.0.x
+    stream: 11.0.x
 
-    java-version: "openjdk11"
+    java-version: "openjdk17"
     mvn-settings: "mdsal-settings"
-    mvn-version: mvn36
-    build-timeout: 90
+    build-timeout: 60
 
     archive-artifacts: >
       **/*.prop
@@ -64,61 +62,25 @@
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-5.0.x
+    name: mdsal-10.0.x
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
+          build-node: centos8-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: 5.0.x
-    stream: 5.0.x
+    branch: 10.0.x
+    stream: 10.0.x
 
-    java-version: "openjdk11"
+    java-version: "openjdk17"
     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
-      **/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"
-    build-timeout: 90
-
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream}"
-    email-upstream: "[mdsal] [odlparent] [yangtools]"
     archive-artifacts: >
       **/*.prop
       **/*.log
@@ -140,6 +102,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 +112,19 @@
       - 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"
+    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}"