Merge "Update multipatch script"

[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 7404e0b81caf58695110b1951cca966efcebf83c..e9a7a7c1f8b8b5d9bd672b9044472ebc100b3347 100644 (file)
--- a/jjb/sxp/sxp-csit-clustering.yaml
+++ b/jjb/sxp/sxp-csit-clustering.yaml
@@ -12,25 +12,30 @@
 
     # Project branches
     stream:
-      - fluorine:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
+          trigger-jobs: '{project}-merge-{stream}'
+          karaf-version: 'odl'
+          # yamllint disable-line rule:line-length
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.8.0-SNAPSHOT/xml/features'
+      - fluorine:
+          branch: 'stable/fluorine'
           trigger-jobs: '{project}-merge-{stream}'
+          karaf-version: 'odl'
           # yamllint disable-line rule:line-length
-          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.2-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+          disable-job: true
 
     install:
       - all:
           scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-sxp-controller'
+    install-features: 'odl-restconf,odl-sxp-routing'
 
     # Robot custom options:
     robot-options: ''