X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcontroller%2Fcontroller-csit-clustering.yaml;h=e3e9e9a27a1a2ac39b3bedccd64aa66a73d85531;hb=526a193d665574f68c70c825ce9de773ebe9ade3;hp=cc5a46b8c31fa872049b678ef6d63058bcdc1507;hpb=2a8744f668e76ecda6b4f579fa9cc01da649963b;p=releng%2Fbuilder.git

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index cc5a46b8c..e3e9e9a27 100644
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -1,47 +1,33 @@
+---
 - project:
     name: controller-csit-clustering
     jobs:
-        - '{project}-csit-3node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-3node-{functionality}'
+      - inttest-csit-3node
 
-    # The project name
-    project: 'controller'
+    project: "controller"
+    functionality:
+      - "clustering-ask"
+      - "clustering-tell"
 
-    # The functionality under test
-    functionality: 'clustering'
+    elasticsearch-attribute: "disabled"
 
-    # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
+      - sulfur:
+          branch: "master"
+          jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: "all"
 
-    # No tools system VMs needed in JCloud configuration
-    mininet-vms: 0
+    tools_system_count: 0
 
-    # Features to install
-    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}
+    install-features: >
+      odl-restconf,
+      odl-clustering-test-app