Merge "Update to global-jjb v0.12.1"

[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 de3e75387dda4c0862d038b9aa0cd33a600cec8f..c887d148012f020cba4bf20d630c8a98a8937d64 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml
@@ -14,16 +14,12 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
           karaf-version: karaf3
 
     install:
@@ -37,4 +33,4 @@
     robot-options: '-v ODL_OF_PLUGIN:lithium'
 
     # mininet image
-    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170703-2150'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20171016-0212'