Make jobs karaf-version specific, some duplicities

[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 419c0acc04ca8347a83982ee4f4198420e559943..ac59b4f0979404b1ea46ed440b6f1f15241318db 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
@@ -1,32 +1,37 @@
+---
 - project:
     name: openflowplugin-csit-scalability
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - '{project}-csit-1node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'openflowplugin'
 
     # The functionality under test
-    functionality: 'scalability'
+    functionality:
+      - scalability
+      - gate-scalability
 
     # Project branches
     stream:
-        - beryllium:
-            branch: 'master'
-        - stable-lithium:
-            branch: 'stable/lithium'
+      - nitrogen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
+      - boron:
+          branch: 'stable/boron'
+          jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - only:
+          scope: 'only'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui'
+    install-features: 'odl-openflowplugin-flow-services-ui,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     # Robot custom options
-    robot-options: '-v TOPO_TREE_DEPTH:7 -e adsal'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream}'
+    robot-options: '-v TOPO_TREE_DEPTH:7'