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 bfd6655964411f752c7acedcf740c78c4c16e4ad..49b0c4b8ed0378664ce74d6a1e785e1d8e651c27 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -3,22 +3,20 @@
     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"
     mvn-settings: "mdsal-settings"
-    mvn-version: mvn36
-    build-timeout: 90
+    build-timeout: 60
 
     archive-artifacts: >
       **/*.prop
@@ -32,25 +30,53 @@
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-7.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: 7.0.x
-    stream: 7.0.x
+    branch: 11.0.x
+    stream: 11.0.x
 
-    java-version: "openjdk11"
     mvn-settings: "mdsal-settings"
-    mvn-version: mvn36
-    build-timeout: 90
+    build-timeout: 60
+
+    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-10.0.x
+    jobs:
+      - "{project-name}-rtd-jobs":
+          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-jdk17
+      - odl-maven-verify-jobs-jdk17
+
+    project: mdsal
+    project-name: mdsal
+    branch: 10.0.x
+    stream: 10.0.x
+
+    mvn-settings: "mdsal-settings"
+    build-timeout: 60
 
     archive-artifacts: >
       **/*.prop
@@ -80,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
@@ -91,14 +117,9 @@
     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}"
+    mvn-goals: "clean deploy"
+    mvn-opts: "-Dintegrationtests"
 
 - project:
     name: mdsal-info