X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fsxp%2Fsxp-csit-topology.yaml;h=52da04d67c11cd0815f127950f5a966f18743965;hb=c4f5571795775e56ec9bef76c40247c4c34cd755;hp=6acadd8b1a2b083ae7a78130287d13bc91d18e10;hpb=5bb916eae434a033004e1aaf30ee6825929f203a;p=releng%2Fbuilder.git

diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml
index 6acadd8b1..3db08c412 100644
--- a/jjb/sxp/sxp-csit-topology.yaml
+++ b/jjb/sxp/sxp-csit-topology.yaml
@@ -1,7 +1,8 @@
+---
 - project:
     name: sxp-csit-topology
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'sxp'
@@ -11,27 +12,20 @@
 
     # Project branches
     stream:
-        - boron:
-            branch: 'master'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
+      - 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'
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-sxp-all'
+    install-features: 'odl-restconf,odl-sxp-controller'
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},tcpmd5-distribution-{stream},sxp-distribution-{stream},mdsal-distribution-{stream},netconf-distribution-{stream}'