Merge "Fix for Pike/Queens Jobs"

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

diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml
index b8442fe501ef3a8e26032c40891008ae9f31602b..be42360bcb88ce280e569ca6dc75c6f828ee346d 100644 (file)
--- a/jjb/sxp/sxp-csit-filtering.yaml
+++ b/jjb/sxp/sxp-csit-filtering.yaml
@@ -1,7 +1,8 @@
+---
 - project:
     name: sxp-csit-filtering
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'sxp'
@@ -11,22 +12,22 @@
 
     # Project branches
     stream:
-        - boron:
-            branch: 'master'
-        - beryllium:
-            branch: 'stable/beryllium'
+      - fluorine:
+          branch: 'master'
+      - 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-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}'