Merge "natapp project jenkins builder jobs"

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
index 05eac77b47e88ac067f281dd0e9737141a9def55..8ed9489c03a32aa4ea862e1751df34953dd5d322 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
@@ -2,7 +2,6 @@
     name: openflowplugin-csit-scalability
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -12,10 +11,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:
@@ -27,7 +31,7 @@
     install-features: 'odl-openflowplugin-flow-services-ui'
 
     # Robot custom options
-    robot-options: '-v TOPO_TREE_DEPTH:7 -e adsal'
+    robot-options: '-v TOPO_TREE_DEPTH:7'
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'