Rework the way Java version is set in CSIT jobs

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml
index 2800f260cd50a198ce7623e28b87481b449a90db..0cd8d7489ff86b2303ba99848784b56167757467 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml
@@ -1,7 +1,7 @@
 - project:
     name: openflowplugin-csit-flow-services-lithium-redesign
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -11,18 +11,25 @@
 
     # Project branches
     stream:
-        - master:
+        - boron:
             branch: 'master'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
+        - stable-lithium:
+            branch: 'stable/lithium'
+            jre: 'openjdk7'
 
     install:
         - only:
             scope: 'only'
 
     # Features to install
-    install-features: 'odl-openflowplugin-app-new-lldp-speaker'
+    install-features: 'odl-openflowplugin-flow-services-ui-li'
 
     # Robot custom options
-    robot-options: '-v TOPO_TREE_DEPTH:5 -e adsal'
+    robot-options: '-e adsal'
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'