Merge "Remove of-config carbon jobs"

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
index 27724beb27850d0547a3a6eb817fd4bc15dbf0c7..a93ea5e084d1499648e061332104c2073a242fcc 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
@@ -14,21 +14,19 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: 'karaf3'
 
     install:
       - only:
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v2-standard-4'
-    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
+    tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20180301-1041'
 
     # Features to install
     install-features: >