Merge "Revert "Install odl-mdsal-trace in netvirt oxygen csit""

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

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
index e7ae4f40ba56b8d2610660e72a2083661890fc59..d5caa6758100a9385f912684ca25b6da08018d33 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
@@ -2,7 +2,7 @@
 - project:
     name: openflowplugin-csit-scale-switch
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'openflowplugin'
@@ -12,8 +12,10 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -25,7 +27,9 @@
           scope: 'only'
 
     # Job images
+    odl_system_flavor: 'v2-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
+    tools_system_flavor: 'v2-highcpu-2'
 
     # Features to install
     install-features: >