Merge "Make message more clear"

[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 1cb1e7b777ef93bdf9c079981930f91ae4493307..561df443edce6a4f4fb60bbda97e7fd79114f710 100644 (file)
--- 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: 'ODLRPC'
-    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: ''