Merge "Update SFC netvirt CSIT with fluorine and queens"

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

diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml
index e8a845c9cfb9548bedf4e5b7d1d601523b6d1fea..7404e0b81caf58695110b1951cca966efcebf83c 100644 (file)
--- a/jjb/sxp/sxp-csit-clustering.yaml
+++ b/jjb/sxp/sxp-csit-clustering.yaml
@@ -1,7 +1,8 @@
+---
 - project:
     name: sxp-csit-clustering
     jobs:
-        - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'sxp'
@@ -11,18 +12,22 @@
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
+      - fluorine:
+          branch: 'master'
+          trigger-jobs: '{project}-merge-{stream}'
+          # yamllint disable-line rule:line-length
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
+      - oxygen:
+          branch: 'stable/oxygen'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: 'all'
 
     # Features to install
     install-features: 'odl-restconf,odl-sxp-controller'