Make Java version for CSIT jobs configurable

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

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index ac64433a669ee2cbccf1201bd6e30fcd0a0edea8..92e9877016ec91c03ebc45a8f3482400666005e3 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -1,7 +1,8 @@
 - project:
     name: controller-csit-clustering
     jobs:
-        - '{project}-csit-3node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-3node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-3node-{functionality}'
 
     # The project name
     project: 'controller'
@@ -11,10 +12,12 @@
 
     # Project branches
     stream:
-        - master:
+        - boron:
             branch: 'master'
-        - stable-lithium:
-            branch: 'stable/lithium'
+            jdk: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:
@@ -29,5 +32,10 @@
     robot-options: ''
 
     # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream}'
-
+    trigger-jobs: >
+        odlparent-distribution-{stream},
+        yangtools-distribution-{stream},
+        mdsal-distribution-{stream},
+        controller-distribution-{stream},
+        netconf-distribution-{stream},
+        integration-distribution-merge-{stream}