Merge "Remove of-config carbon jobs"

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

diff --git a/jjb/sxp/sxp-csit-cluster-routing.yaml b/jjb/sxp/sxp-csit-cluster-routing.yaml
index afd64a358f57fda459547ee870cd41d8a60c09e4..a54a2f697ab06b1471d178b189260d764e613d71 100644 (file)
--- a/jjb/sxp/sxp-csit-cluster-routing.yaml
+++ b/jjb/sxp/sxp-csit-cluster-routing.yaml
@@ -2,7 +2,7 @@
 - project:
     name: sxp-csit-routing
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'sxp'
@@ -12,22 +12,22 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - fluorine:
           branch: 'master'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
+          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'
+      - nitrogen:
+          branch: 'stable/nitrogen'
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-sxp-controller,odl-sxp-route'
+    install-features: 'odl-restconf,odl-sxp-controller,odl-sxp-routing'
 
     # Tools VMs:
     tools_system_count: 2