Merge "Fix for Pike/Queens Jobs"

[releng/builder.git] / jjb / openflowplugin / openflowplugin-csit-clustering.yaml

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
index afb19c9220651e79b63eb9da1d1b0da609a6250d..5b564592c1ee766586cebb583d5f273b1440a6bc 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-clustering
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'openflowplugin'
@@ -14,25 +14,25 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - fluorine:
           branch: 'master'
-          jre: 'openjdk8'
+      - oxygen:
+          branch: 'stable/oxygen'
+      - nitrogen:
+          branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
+          karaf-version: 'karaf3'
 
     install:
       - only:
           scope: 'only'
 
+    # Job images
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
+
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,odl-openflowplugin-app-table-miss-enforcer'
+    install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-app-table-miss-enforcer'
 
     # Robot custom options
     robot-options: '-v ODL_OF_PLUGIN:lithium'
-
-    # mininet image
-    tools_system_image: 'Ubuntu 14.04 - mininet-ovs-25 - 20170210-0300'