Merge "Migrate tsdr matrix-verify jobs to freestyle-verify jobs"

[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 b796c30e929134ac2b7b24efcf2ad6807df727b9..c4f588bc7a05a083e8a0999542c145459b404560 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-southbound.yaml
+++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml
@@ -1,8 +1,8 @@
 - project:
     name: ovsdb-csit-southbound
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
    # The project name
     project: 'ovsdb'
 
@@ -11,10 +11,15 @@
 
     # Project branches
     stream:
-        - master:
+        - boron:
             branch: 'master'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -22,12 +27,14 @@
         - all:
             scope: 'all'
 
+    # Mininet configuration
+    mininet-vms: 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}'