X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgroupbasedpolicy%2Fgroupbasedpolicy-csit-6node.yaml;h=561df443edce6a4f4fb60bbda97e7fd79114f710;hb=7b80a2bb2c004a4fd29c36c337de01610b718446;hp=07d1d41929d02c1bca54d1cadbc9153706639ef1;hpb=5bb916eae434a033004e1aaf30ee6825929f203a;p=releng%2Fbuilder.git

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index 07d1d4192..561df443e 100644
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -12,15 +12,15 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
             jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
 
     install:
         - only:
@@ -29,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 - 20170117-0042
 
     # Features to install
     install-features: 'odl-groupbasedpolicy-ofoverlay,
@@ -39,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: ''