Make Java version for CSIT jobs configurable

[releng/builder.git] / jjb / openflowplugin / openflowplugin-csit-scalability-lithium-redesign.yaml

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml
index cb9190158c1b3826f9968a3bdae4e33f5042331e..48afc44a27cd197dd7cd1ee0c016d41bb545a972 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-scalability-lithium-redesign
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,16 +11,19 @@
 
     # Project branches
     stream:
-        - master:
+        - boron:
             branch: 'master'
+            jdk: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
             scope: 'only'
-        - all:
-            scope: 'all'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-ui-li'
@@ -30,4 +33,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-