Merge "Fix for Pike/Queens Jobs"

[releng/builder.git] / jjb / ovsdb / ovsdb-csit-clustering.yaml

diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml
index abdf3ea5f365e3a16e8509aee2c81f98a634beaf..e0e4969a03c80675c17d29578cfde483abf9de22 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -2,25 +2,27 @@
 - project:
     name: ovsdb-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: 'ovsdb'
 
     # The functionality under test
-    functionality: 'clustering'
+    functionality:
+      - 'upstream-clustering'
+      - 'gate-clustering'
 
     # Project branches
     stream:
-      - carbon:
+      - fluorine:
           branch: 'master'
-          jre: 'openjdk8'
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
+      - oxygen:
+          branch: 'stable/oxygen'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
 
     install:
       - only: