X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcontroller%2Fcontroller-csit-clustering.yaml;h=ba63cef0b2b21476d69c46ac808f750f0ae5f755;hb=4365a26d27b4ce3ca1f03c7a6d270c0658cfed88;hp=92e9877016ec91c03ebc45a8f3482400666005e3;hpb=078eca553c824ed2f789a0ab46ec21823feb2504;p=releng%2Fbuilder.git

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index 92e987701..ba63cef0b 100644
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -1,8 +1,9 @@
+---
 - project:
     name: controller-csit-clustering
     jobs:
-        - '{project}-csit-3node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-3node-{functionality}'
+      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - '{project}-csit-verify-3node-{functionality}'
 
     # The project name
     project: 'controller'
@@ -12,30 +13,35 @@
 
     # Project branches
     stream:
-        - boron:
-            branch: 'master'
-            jdk: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+      - nitrogen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
+      - boron:
+          branch: 'stable/boron'
+          jre: 'openjdk8'
+          karaf-version: karaf3
+      - beryllium:
+          branch: 'stable/beryllium'
+          jre: 'openjdk7'
+          karaf-version: karaf3
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - only:
+          scope: 'only'
+      - 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}