Rework the way Java version is set in CSIT jobs

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 9f2539ee8e5ffd501a0a3d6f465c9c8c5d67b0c4..c6bcd6d84f8f1c2144695ed3fe1ae1483ffbd4e6 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -1,8 +1,8 @@
 - project:
     name: openflowplugin-csit-flow-services
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'openflowplugin'
@@ -12,10 +12,12 @@
 
     # Project branches
     stream:
-        - master:
+        - boron:
             branch: 'master'
-        - stable-lithium:
-            branch: 'stable/lithium'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -24,11 +26,10 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-adsal-compatibility,odl-nsf-all'
+    install-features: 'odl-openflowplugin-flow-services-ui'
 
     # Robot custom options
-    robot-options: ''
+    robot-options: '-e adsal'
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
-