Merge "Remove all refs to nitrogen in packaging"

[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 ecd7d318a6ccd757df22f24d23285e7b77e38087..922b788958cf024f96fa2a2ab145a1302d3f5999 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,21 +12,17 @@
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            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-controller'