Merge "Update cloud image CentOS7 builder x86_64"

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

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 9a187107e48579146b71f5a210ac71afbb2d2cf7..83f25b5d98472ec6e8cfda6dbd4ce6c316a74803 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -7,8 +7,7 @@
           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
@@ -16,9 +15,9 @@
     branch: master
     stream: master
 
-    java-version: "openjdk11"
-    mvn-settings: "mdsal-settings"
     build-node: centos8-builder-4c-4g
+    java-version: "openjdk17"
+    mvn-settings: "mdsal-settings"
     build-timeout: 60
 
     archive-artifacts: >
@@ -33,7 +32,7 @@
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-8.0.x
+    name: mdsal-9.0.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -42,15 +41,16 @@
           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: 8.0.x
-    stream: 8.0.x
+    branch: 9.0.x
+    stream: 9.0.x
 
     java-version: "openjdk11"
     mvn-settings: "mdsal-settings"
-    mvn-version: mvn36
     build-timeout: 60
 
     archive-artifacts: >
@@ -65,7 +65,7 @@
     staging-profile-id: a674173c7b29d
 
 - project:
-    name: mdsal-7.0.x
+    name: mdsal-8.0.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -77,8 +77,8 @@
 
     project: mdsal
     project-name: mdsal
-    branch: 7.0.x
-    stream: 7.0.x
+    branch: 8.0.x
+    stream: 8.0.x
 
     java-version: "openjdk11"
     mvn-settings: "mdsal-settings"
@@ -124,10 +124,12 @@
     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}"