Use cluster config file in cluster tests

[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 9004ab113adac7643fe61707c8259d245b820461..d4e05e21786d07973b38535f9ba1fefdb258f7c8 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -12,8 +12,12 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -21,8 +25,11 @@
         - all:
             scope: 'all'
 
+    # No tools system VMs needed in JCloud configuration
+    mininet-vms: 0
+
     # Features to install
-    install-features: 'odl-restconf,odl-clustering-test-app,odl-netconf-connector-ssh'
+    install-features: 'odl-restconf,odl-clustering-test-app'
 
     # Robot custom options
     robot-options: ''