Set JDK11 for all magnesium build jobs

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

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 2307ce14a36e9c81c76f6b98ad44cbfcb3218cdf..b0f64babd60ed842b3d1a562b9f5a27eb871e17a 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -2,15 +2,15 @@
 - project:
     name: odlparent-master
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - 'gerrit-release-merge'
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
+          doc-dir: .tox/docs/tmp/html
           project-pattern: odlparent
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-odlparent/50830/
           rtd-token: e5afd4ac1ead64408d9e13cd1f628ade55512f8f
-      - odl-maven-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
       - gerrit-tox-verify
 
     project: odlparent
@@ -18,6 +18,7 @@
     stream: master
     branch: master
 
+    java-version: 'openjdk11'
     mvn-settings: odlparent-settings
     mvn-opts: '-Xmx1024m'
     mvn-version: mvn35
@@ -38,9 +39,9 @@
 - project:
     name: odlparent-5.0.x
     jobs:
-      - '{project-name}-gerrit-release-jobs'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
       - gerrit-tox-verify
 
     project: odlparent
@@ -68,9 +69,9 @@
 - project:
     name: odlparent-4.0.x
     jobs:
-      - '{project-name}-gerrit-release-jobs'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
       - gerrit-tox-verify
 
     project: odlparent
@@ -98,9 +99,9 @@
 - project:
     name: odlparent-3.1.x
     jobs:
-      - '{project-name}-gerrit-release-jobs'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
+      - odl-maven-verify-jobs
       - gerrit-tox-verify
 
     project: odlparent
@@ -136,6 +137,7 @@
     project: 'odlparent'
     project-name: 'odlparent'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'odlparent-settings'
     mvn-opts: '-Xmx1024m'