Feat: Branch cut stable/potassium

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

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index b84876a311f3cfeeb6ebcbd99c35c2f5abefb43e..49b0c4b8ed0378664ce74d6a1e785e1d8e651c27 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -3,7 +3,7 @@
     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
@@ -15,8 +15,6 @@
     branch: master
     stream: master
 
-    build-node: centos8-builder-4c-4g
-    java-version: "openjdk17"
     mvn-settings: "mdsal-settings"
     build-timeout: 60
 
@@ -32,24 +30,21 @@
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-9.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-verify-jobs-jdk17:
-        build-node: centos8-builder-4c-4g
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
     project: mdsal
     project-name: mdsal
-    branch: 9.0.x
-    stream: 9.0.x
+    branch: 11.0.x
+    stream: 11.0.x
 
-    java-version: "openjdk11"
     mvn-settings: "mdsal-settings"
     build-timeout: 60
 
@@ -65,24 +60,22 @@
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-8.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: 8.0.x
-    stream: 8.0.x
+    branch: 10.0.x
+    stream: 10.0.x
 
-    java-version: "openjdk11"
     mvn-settings: "mdsal-settings"
-    mvn-version: mvn36
     build-timeout: 60
 
     archive-artifacts: >
@@ -113,7 +106,7 @@
 - project:
     name: mdsal-sonar
     jobs:
-      - gerrit-maven-sonar:
+      - odl-sonar-jobs-jdk17:
           mvn-params: >
             -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
             -Dskip.karaf.featureTest=true
@@ -124,16 +117,9 @@
     project: "mdsal"
     project-name: "mdsal"
     branch: "master"
-    build-node: centos8-builder-4c-4g
-    java-version: "openjdk17"
-    mvn-version: mvn38
     mvn-settings: "mdsal-settings"
     mvn-goals: "clean deploy"
     mvn-opts: "-Dintegrationtests"
-    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