X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcontroller%2Fcontroller-csit-clustering.yaml;h=e0c41376e93c3d9b44697d2b8e0152a8a9f456cf;hb=f17e9e7c655b0b32f96ad9a8cdf3c27903cb542f;hp=8778cf5f32e30e5075bd4b4f0741f48023126f3b;hpb=e4d04440ba14634e48b5a806d1c4273ff8c8edb1;p=releng%2Fbuilder.git

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index 8778cf5f3..e0c41376e 100644
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -2,46 +2,28 @@
 - project:
     name: controller-csit-clustering
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-3node-{functionality}'
+      - inttest-csit-3node
+      - inttest-csit-verify-3node
 
-    # The project name
     project: 'controller'
+    functionality:
+      - 'clustering-ask'
+      - 'clustering-tell'
 
-    # The functionality under test
-    functionality: 'clustering'
-
-    # Project branches
     stream:
-      - nitrogen:
+      - neon:
           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
+      - fluorine:
+          branch: 'stable/fluorine'
+      - oxygen:
+          branch: 'stable/oxygen'
 
     install:
-      - 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-noauth,
+        odl-restconf,
         odl-clustering-test-app
-
-    # Robot custom options
-    robot-options: ''