Update automated project templates

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

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index c2da570fd9de18a18f7c42447df41ef06f3a0e2d..8d3d25f1f9185676dfe8a650f0b2f9d66fea9e06 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -19,9 +19,18 @@
     stream:
         - master:
             branch: 'master'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
+                - openjdk8
 
     project: 'neutron'
-    jdk: 'openjdk7'
 
 # For the Job templates below replace instances of:
 # PROJECT with your project name (eg. controller)
@@ -51,9 +60,7 @@
                 - dynamic_verify
         - axis:
             type: jdk
-            values:
-                - openjdk7
-
+            values: '{obj:jdks}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -239,10 +246,11 @@
     name: 'neutron-integration-{stream}'
     disabled: false
 
-    # Job template for ODL merge jobs
+    # Job template for ODL integration verify jobs
     #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
+    # This is similar to a normal verify job, but it runs
+    # when a project that's a dependency of your project
+    # is successfully built.
     #
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable-helium)
@@ -306,7 +314,7 @@
 
     project-type: maven
     node: dynamic_verify
-    jdk: '{jdk}'
+    jdk: 'openjdk7'
 
     logrotate:
         daysToKeep: '7'
@@ -360,7 +368,7 @@
 
     project-type: maven
     node: dynamic_verify
-    jdk: '{jdk}'
+    jdk: 'openjdk7'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'