Merge "Do not pinpoint version of elasticsearch*"

[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 c3ee0b48d7c91db95be6ced46ce21d192074bcd6..15d7d1131d5bdfdee5aad5d9b145d7663b0cf9dc 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -30,7 +30,7 @@
 
     # 6 Ubuntu VMs in JCloud configuration
     tools_system_count: 6
-    tools_system_image: Ubuntu 14.04 - gbp - 20161031-0916
+    tools_system_image: Ubuntu 14.04 - gbp - 20170210-0536
 
     # Features to install
     install-features: 'odl-groupbasedpolicy-ofoverlay,
@@ -38,12 +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},
-                   openflowplugin-distribution-{stream},
-                   sfc-distribution-{stream},
-                   dlux-distribution-{stream}'
+    robot-options: ''