Make Java version for CSIT jobs configurable

[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 cb1ea4e9e6ca4a4065e29403750a7b5c6db50add..509838154894264ab2ba0bcda3e4fb6d15a61e51 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -1,7 +1,8 @@
 - project:
     name: openflowplugin-csit-clustering
     jobs:
-        - '{project}-csit-3node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-3node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-3node-{functionality}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,18 +12,25 @@
 
     # 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'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-adsal-compatibility,odl-nsf-all'
+    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}'