Use CentOS 8 builders only for JDK17 verify

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

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 8f131229d9d0e67e81769aa11e4de07c5be32bf6..ee91f23a66b5c62c71a8e942ea8b2541c48415e5 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -9,6 +9,8 @@
           rtd-token: b8440116c823a80c0fb0479eb7448a9196e6932f
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17:
+        build-node: centos8-builder-4c-4g
 
     stream: master
     project: "controller"
@@ -16,7 +18,6 @@
     branch: "master"
     java-version: "openjdk11"
     mvn-settings: "controller-settings"
-    mvn-version: mvn36
     mvn-goals: "clean deploy -Pdocs"
     mvn-opts: "-Xmx3072m -Dmaven.compile.fork=true"
     build-timeout: 90
@@ -27,7 +28,7 @@
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-2.0.x
+    name: controller-4.0.x
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -37,10 +38,10 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: 2.0.x
+    stream: 4.0.x
     project: "controller"
     project-name: "controller"
-    branch: "2.0.x"
+    branch: "4.0.x"
     java-version: "openjdk11"
     mvn-settings: "controller-settings"
     mvn-version: mvn36
@@ -54,9 +55,8 @@
     staging-profile-id: 96c1c9177efdd
 
 - project:
-    name: controller-magnesium
+    name: controller-3.0.x
     jobs:
-      - "{project-name}-distribution-check-{stream}":
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: controller
@@ -65,15 +65,15 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: 3.0.x
     project: "controller"
     project-name: "controller"
-    branch: "stable/magnesium"
+    branch: "3.0.x"
     java-version: "openjdk11"
     mvn-settings: "controller-settings"
-    mvn-goals: "clean deploy -Pintegrationtests,docs"
-    mvn-opts: "-Xmx4096m -Dmaven.compile.fork=true"
-    build-node: centos7-builder-8c-8g
+    mvn-version: mvn36
+    mvn-goals: "clean deploy -Pdocs"
+    mvn-opts: "-Xmx3072m -Dmaven.compile.fork=true"
     build-timeout: 90
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}"
     email-upstream: "[controller] [odlparent] [yangtools] [aaa]"
@@ -91,6 +91,9 @@
 
     build-node: centos7-builder-2c-1g
     mvn-settings: controller-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: controller-sonar
@@ -107,6 +110,7 @@
     project-name: "controller"
     branch: master
     java-version: "openjdk11"
+    mvn-version: mvn38
     mvn-settings: "controller-settings"
     mvn-goals: "clean deploy -Pintegrationtests,docs"
     mvn-opts: "-Xmx4096m -Dmaven.compile.fork=true"