Make Java version for CSIT jobs configurable

[releng/builder.git] / jjb / lacp / lacp-csit-lacp.yaml

diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml
index 8a078d27a5f324c6d853c5bafbc1d7453c37a9b8..19e18dc9a28bffdcda978b15821f309596b6b0a6 100644 (file)
--- a/jjb/lacp/lacp-csit-lacp.yaml
+++ b/jjb/lacp/lacp-csit-lacp.yaml
@@ -1,8 +1,8 @@
 - project:
     name: lacp-csit-lacp
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'lacp'
@@ -12,10 +12,15 @@
 
     # Project branches
     stream:
-        - master:
+        - boron:
             branch: 'master'
+            jdk: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
@@ -23,6 +28,8 @@
         - all:
             scope: 'all'
 
+    mininet-image: 'ubuntu-trusty-mininet-ovs-23'
+
     # Features to install
     install-features: 'odl-lacp-ui'
 
@@ -31,4 +38,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},lacp-distribution-{stream}'
-