Merge "Make builder jobs use a machine with less RAM"

[releng/builder.git] / jjb / controller / controller-csit-rest-cars-perf.yaml

diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml
index 49c1c4a500e8ab98590482b8e3285d3a4aec3caa..303722338df08a7ad7c723e6f747fe818a684586 100644 (file)
--- a/jjb/controller/controller-csit-rest-cars-perf.yaml
+++ b/jjb/controller/controller-csit-rest-cars-perf.yaml
@@ -11,12 +11,15 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
+            jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-        - stable-lithium:
-            branch: 'stable/lithium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -29,6 +32,3 @@
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},aaa-distribution-{stream},netconf-distribution-{stream},mdsal-distribution-{stream}'