Make Java version for CSIT jobs configurable

[releng/builder.git] / jjb / sfc / sfc-csit-clustering.yaml

diff --git a/jjb/sfc/sfc-csit-clustering.yaml b/jjb/sfc/sfc-csit-clustering.yaml
index 50eeca2ff2dd714d638b64c4ddd9176d6bb4a3b0..69d0a40a373f2d91d2fab46272457fe90ebe23a0 100644 (file)
--- a/jjb/sfc/sfc-csit-clustering.yaml
+++ b/jjb/sfc/sfc-csit-clustering.yaml
@@ -1,7 +1,7 @@
 - project:
     name: sfc-csit-clustering
     jobs:
-        - '{project}-csit-3node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-3node-{functionality}-{install}-{stream}'
 
 
     # The project name
@@ -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,10 +28,6 @@
         - all:
             scope: 'all'
 
-    # Mininet configuration
-    mininet-image: 'rk-c-el6-mininet'
-    mininet-vms: 1
-
     # Features to install
     install-features: 'odl-sfc-core,odl-restconf-all'