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 e98cfbc348feaee9ee5cba8c1868a7ae51777b05..8ed9489c03a32aa4ea862e1751df34953dd5d322 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
@@ -13,10 +13,13 @@
     stream:
         - boron:
             branch: 'master'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -28,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}'