Merge "Update SFC netvirt CSIT with fluorine and queens"

[releng/builder.git] / jjb / mdsal / mdsal-csit-bindingv1.yaml

diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml
index b9e5895d22a53b1c854d5f4990f6ae0fd73c4cbe..6a6cb9b2ef5bdba66c05916b4bd8abe3515fbf1e 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-bindingv1
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'mdsal'
@@ -11,8 +11,10 @@
     functionality: 'bindingv1'
 
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -26,7 +28,7 @@
 
     # No tools system VMs needed, but ODL system needs RAM and benefits from CPUs.
     tools_system_count: 0
-    odl_system_flavor: v1-performance-2
+    odl_system_flavor: odl-standard-4
 
     # Features to install
     install-features: 'odl-restconf'