X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgroupbasedpolicy%2Fgroupbasedpolicy-csit-6node.yaml;h=15d7d1131d5bdfdee5aad5d9b145d7663b0cf9dc;hb=d21aa1a7d7942113e327e3f1d6998d855a48a89b;hp=604b801239163fdbd591a29a8031d6992d83b666;hpb=8e5a5faf2f701f63ce87760b78e48168fbd3b0ab;p=releng%2Fbuilder.git

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index 604b80123..15d7d1131 100644
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -12,10 +12,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:
@@ -24,9 +29,8 @@
             scope: 'all'
 
     # 6 Ubuntu VMs in JCloud configuration
-    mininet-image: 'gbp-trusty'
-    mininet-cloud-name: 'Ubuntu'
-    mininet-vms: 6
+    tools_system_count: 6
+    tools_system_image: Ubuntu 14.04 - gbp - 20170210-0536
 
     # Features to install
     install-features: 'odl-groupbasedpolicy-ofoverlay,
@@ -34,14 +38,4 @@
                        odl-restconf-all'
 
     # Robot custom options
-    robot-options: '-v ODL_VERSION:{stream}'
-
-    # Trigger jobs (upstream dependencies)
-    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}'
+    robot-options: ''