X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgroupbasedpolicy%2Fgroupbasedpolicy-csit-6node.yaml;h=4b9d9680d9bfc6bb890a4be2da2ba9c30a831c52;hb=75f57df8dd67003a19c6963b61a7e5009642c29d;hp=4f4f0ce79371590286aab9c670948796aa0bfd73;hpb=078eca553c824ed2f789a0ab46ec21823feb2504;p=releng%2Fbuilder.git

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index 4f4f0ce79..4b9d9680d 100644
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -12,15 +12,18 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -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}'