X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fovsdb%2Fovsdb-csit-clustering.yaml;h=7c2c3991c7ac442b184cc812e3c52a24790b5752;hb=f9510ad2361a13149cd478e9d0863d0efe3dd772;hp=9282deddc588617a7f20b1123f7e5fedb5c14a8f;hpb=c5e04f9e6d91ae8fa9d2d73dd34d4b8f7224d0fb;p=releng%2Fbuilder.git

diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml
index 9282deddc..7c2c3991c 100644
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -1,38 +1,36 @@
+---
 - project:
     name: ovsdb-csit-clustering
     jobs:
-        - '{project}-csit-3node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-3node-{functionality}'
-   # The project name
+      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - '{project}-csit-verify-3node-{functionality}'
+    # The project name
     project: 'ovsdb'
 
     # The functionality under test
-    functionality: 'clustering'
+    functionality:
+      - 'upstream-clustering'
+      - 'gate-clustering'
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
+      - oxygen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
-        - only:
-            scope: 'only'
+      - only:
+          scope: 'only'
 
     # Features to install
     install-features: 'odl-ovsdb-southbound-impl-rest,decanter-collector-jmx,decanter-appender-elasticsearch'
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},ovsdb-distribution-{stream}'