Rework the way Java version is set in CSIT jobs

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index e45214bdbe583c82fb52c3c62f1c839866b46e29..2cf6197f4aa64f7b6de54bac940c9b973f505a9b 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -2,6 +2,7 @@
     name: openflowplugin-csit-clustering
     jobs:
         - '{project}-csit-3node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-3node-{functionality}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,8 +12,15 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -22,7 +30,7 @@
     install-features: 'odl-openflowplugin-flow-services-ui-li'
 
     # Robot custom options
-    robot-options: ''
+    robot-options: '-v ODL_OF_PLUGIN:lithium'
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'