Merge "Add VLAN private network support to devstack"

[releng/builder.git] / jjb / unimgr / unimgr-csit-basic.yaml

diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml
index 10e2c19a269ec298bb90aa6e08659ca401902f61..6448505203a34d5bc8e0ac6182a4dcaaeabf895f 100644 (file)
--- a/jjb/unimgr/unimgr-csit-basic.yaml
+++ b/jjb/unimgr/unimgr-csit-basic.yaml
@@ -12,10 +12,15 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
+            jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -23,11 +28,14 @@
         - all:
             scope: 'all'
 
+    # Mininet configuration
+    tools_system_count: 2
+
     # Features to install
-    install-features: 'odl-unimgr'
+    install-features: 'odl-unimgr-ui'
 
     # Robot custom options
     robot-options: ''
 
     # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},ovsdb-distribution-{stream},unimgr-distribution-{stream}'
+    trigger-jobs: 'ovsdb-distribution-{stream},unimgr-distribution-{stream}'