Merge "Add CSIT job for DIDM discovery tests."

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

diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml
index 8b90bae4977dc890d658be320dd6b02529c193ac..0baf9a4dcd635c05cbd64599a4dee8c36bf0b416 100644 (file)
--- a/jjb/nic/nic-csit-basic.yaml
+++ b/jjb/nic/nic-csit-basic.yaml
@@ -1,8 +1,8 @@
 - project:
     name: nic-csit-basic
     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: 'nic'
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-        - master:
+        - boron:
             branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
 
@@ -23,10 +25,6 @@
         - all:
             scope: 'all'
 
-    # Mininet configuration
-    mininet-image: 'rk-c-el6-mininet'
-    mininet-vms: 1
-
     # Features to install
     install-features: 'odl-nic-core,odl-nic-console,odl-nic-renderer-vtn,odl-nic-renderer-gbp'