Merge "Revert gerrit-patch macro back to git review"

[releng/builder.git] / jjb / groupbasedpolicy / groupbasedpolicy-csit-clustering.yaml

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
index c66cb5ed81927b2a0c92c159931f622d62ea1af6..ac27097a943faf1f983c21d9d6c29f7315514f80 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.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:
@@ -27,7 +32,4 @@
     install-features: 'odl-groupbasedpolicy-ofoverlay,odl-groupbasedpolicy-ui,odl-restconf-all'
 
     # Robot custom options
-    robot-options: '-v ODL_VERSION:{stream}'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'odlparent-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: ''