Enable Heat for csit-1node and csit-verify-1node

[releng/builder.git] / jjb / ovsdb / ovsdb-csit-southbound.yaml

diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml
index ffdbe0b8e6fc4585c02c7fabadaa8ef351e4ca59..cef56dea87ed40bba38db02c45456911ad89ab0a 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -11,10 +11,15 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - carbon:
             branch: 'master'
-        - stable-lithium:
-            branch: 'stable/lithium'
+            jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -23,14 +28,13 @@
             scope: 'all'
 
     # Mininet configuration
-    mininet-vms: 2
+    tools_system_count: 2
 
     # Features to install
-    install-features: 'odl-ovsdb-openstack'
+    install-features: 'odl-ovsdb-southbound-impl-rest'
 
     # Robot custom options
     robot-options: ''
 
     # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distributio
-n-{stream},ovsdb-distribution-{stream}'
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},ovsdb-distribution-{stream}'