Rework the way Java version is set in CSIT jobs

[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 6343fdae80dea34dd0e5e88072d0fc106f37cac3..79ce7e65ef62df566d251e10cc34f992d4115649 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -2,6 +2,7 @@
     name: controller-csit-clustering
     jobs:
         - '{project}-csit-3node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-3node-{functionality}'
 
     # The project name
     project: 'controller'
@@ -11,10 +12,12 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
-        - stable-lithium:
-            branch: 'stable/lithium'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -23,10 +26,16 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-clustering-test-app,odl-netconf-connector-ssh'
+    install-features: 'odl-restconf,odl-clustering-test-app,odl-jolokia'
 
     # Robot custom options
     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}