Add JDK17 verify jobs for MRI projects

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

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 4a8af4c063519006f1b9367d453a800731286b53..56addf63b4b50b58582446f4d552a43c179dc47b 100644 (file)
--- a/jjb/aaa/aaa.yaml
+++ b/jjb/aaa/aaa.yaml
@@ -1,8 +1,7 @@
 ---
 - project:
-    name: aaa-silicon
+    name: aaa-master
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: aaa
@@ -10,14 +9,16 @@
           rtd-token: 621132230e1307d38f4aaf27e669d7dfdf98532f
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17
 
-    stream: silicon
+    stream: master
     project: "aaa"
     project-name: "aaa"
     branch: "master"
     java-version: "openjdk11"
     mvn-settings: "aaa-settings"
     mvn-opts: "-Xmx1024m"
+    build-node: centos8-builder-4c-4g
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
     email-upstream: "[aaa] [odlparent] [yangtools] [controller]"
 
@@ -25,9 +26,8 @@
     staging-profile-id: 9318cf3c82c33
 
 - project:
-    name: aaa-aluminium
+    name: aaa-0.14.x
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: aaa
@@ -36,10 +36,10 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: 0.14.x
     project: "aaa"
     project-name: "aaa"
-    branch: "stable/aluminium"
+    branch: 0.14.x
     java-version: "openjdk11"
     mvn-settings: "aaa-settings"
     mvn-opts: "-Xmx1024m"
@@ -48,11 +48,9 @@
 
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
-
 - project:
-    name: aaa-magnesium
+    name: aaa-0.13.x
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: aaa
@@ -61,10 +59,10 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: 0.13.x
     project: "aaa"
     project-name: "aaa"
-    branch: "stable/magnesium"
+    branch: 0.13.x
     java-version: "openjdk11"
     mvn-settings: "aaa-settings"
     mvn-opts: "-Xmx1024m"
@@ -84,6 +82,9 @@
 
     build-node: centos7-builder-2c-1g
     mvn-settings: aaa-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: 60
 
 - project:
     name: aaa-sonar