Merge "Fix for Pike/Queens 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 ea209ced02c2ca3045af7ea1fe2df293e8f331ac..8f6aec788956909b5cfdde2caa4ee2bca6bb02ab 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-periodic
 
     # The project name
     project: 'sxp'
@@ -12,21 +12,18 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
-          jre: 'openjdk8'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
           install-features: 'odl-restconf,odl-sxp-controller,odl-sxp-route'
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'