Merge changes from topic 'improve-linting'

[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 9af7c48017f390ab2c054edbb644b10889b79131..72371b93a000410f364c156bd0ebb2040aa24de7 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -12,10 +12,15 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
+            jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -23,17 +28,11 @@
         - all:
             scope: 'all'
 
+    # No tools system VMs needed in JCloud configuration
+    tools_system_count: 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: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: >
-        odlparent-distribution-{stream},
-        yangtools-distribution-{stream},
-        mdsal-distribution-{stream},
-        controller-distribution-{stream},
-        netconf-distribution-{stream},
-        integration-distribution-merge-{stream}