Rework the way Java version is set in CSIT jobs

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
index 664e6fe217e6d53143e506acaa66c36d77c0189c..f8f1d9ae167e3061433355effae1ead8b9a589b7 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
@@ -1,8 +1,7 @@
 - project:
     name: openflowplugin-csit-scalability
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -12,10 +11,15 @@
 
     # Project branches
     stream:
-        - master:
+        - boron:
             branch: 'master'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -31,4 +35,3 @@
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-