Merge "configure ODL L3 on computes based on CONTROLLERFEATURES"

[releng/builder.git] / jjb / groupbasedpolicy / groupbasedpolicy-csit-6node.yaml

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index 07d1d41929d02c1bca54d1cadbc9153706639ef1..4b9d9680d9bfc6bb890a4be2da2ba9c30a831c52 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
@@ -29,8 +32,7 @@
             scope: 'all'
 
     # 6 Ubuntu VMs in JCloud configuration
-    mininet-image: 'gbp-trusty'
-    mininet-cloud-name: 'Ubuntu'
+    mininet-image: 'ubuntu-trusty-gbp-2c-2g'
     mininet-vms: 6
 
     # Features to install
@@ -45,8 +47,6 @@
     trigger-jobs: 'groupbasedpolicy-distribution-{stream},
                    neutron-distribution-{stream},
                    ovsdb-distribution-{stream},
-                   controller-distribution-{stream},
                    openflowplugin-distribution-{stream},
-                   yangtools-distribution-{stream},
                    sfc-distribution-{stream},
                    dlux-distribution-{stream}'