Add missing JDK11 to distribution jobs

[releng/builder.git] / jjb / integration / distribution / distribution-jobs.yaml

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 5b56cd4e4864288881b1f11db21db313d2e4826c..623489a4259a7ae58584b57d024c10ed51b84cf2 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -23,7 +23,8 @@
     stream:
       - magnesium:
           branch: 'master'
-          java-version: openjdk11
+          java-version: 'openjdk11'
+          jre: 'openjdk11'
           karaf-version: odl
       - sodium:
           branch: 'stable/sodium'
@@ -70,23 +71,24 @@
     stream:
       - magnesium:
           branch: 'master'
-          java-version: openjdk11
+          java-version: 'openjdk11'
+          jre: 'openjdk11'
           dependencies: >
-              aaa-merge-{stream},
-              bgpcep-merge-{stream},
-              coe-merge-{stream},
-              controller-merge-{stream},
-              daexim-merge-{stream},
-              genius-merge-{stream},
-              infrautils-merge-{stream},
-              lispflowmapping-merge-{stream},
-              mdsal-merge-{stream},
-              netconf-merge-{stream},
-              netvirt-merge-{stream}
-              neutron-merge-{stream},
-              openflowplugin-merge-{stream},
-              ovsdb-merge-{stream},
-              serviceutils-merge-{stream},
+              aaa-maven-merge-{stream},
+              bgpcep-maven-merge-{stream},
+              coe-maven-merge-{stream},
+              controller-maven-merge-{stream},
+              daexim-maven-merge-{stream},
+              genius-maven-merge-{stream},
+              infrautils-maven-merge-{stream},
+              lispflowmapping-maven-merge-{stream},
+              mdsal-maven-merge-{stream},
+              netconf-maven-merge-{stream},
+              netvirt-maven-merge-{stream}
+              neutron-maven-merge-{stream},
+              openflowplugin-maven-merge-{stream},
+              ovsdb-maven-merge-{stream},
+              serviceutils-maven-merge-{stream},
       - sodium:
           branch: 'stable/sodium'
           dependencies: >
@@ -149,7 +151,7 @@
     stream:
       - magnesium:
           branch: 'master'
-          java-version: openjdk11
+          java-version: 'openjdk11'
           karaf-version: odl
           dependencies: >
               distribution-merge-managed-{stream},
@@ -186,7 +188,7 @@
     stream:
       - magnesium:
           branch: 'master'
-          java-version: openjdk11
+          java-version: 'openjdk11'
       - sodium:
           branch: 'stable/sodium'
       - neon:
@@ -200,6 +202,7 @@
     project: integration/distribution
     project-name: distribution
     branch: master
+    java-version: 'openjdk11'
     mvn-settings: integration-distribution-settings
     mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt
     mvn-opts: '-Xmx1024m'