Merge "natapp project jenkins builder 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 6eb00a186a6c2cd9b638a429f68a3d5ffb076151..e7ee3c5d9acd05cd4a869e05b882f77a64b687b3 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -2,7 +2,7 @@
     name: openflowplugin-csit-flow-services
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'openflowplugin'
@@ -12,10 +12,12 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
-        - stable-lithium:
-            branch: 'stable/lithium'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -24,7 +26,7 @@
             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: ''