Merge "Fix SC2059 for ShellCheck 0.4.4, printf formatting"

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

diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml
index 00950eff3b11843f27b61c5a051d986d2737c097..55bec1ec27237bf4089d694d2134b8b705b22ba1 100644 (file)
--- a/jjb/sxp/sxp-csit-topology.yaml
+++ b/jjb/sxp/sxp-csit-topology.yaml
@@ -12,15 +12,20 @@
 
     # Project branches
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+          trigger-jobs: '{project}-merge-{stream}'
+          karaf-version: 'odl'
+          # yamllint disable-line rule:line-length
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp//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//xml/features'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all: