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

[releng/builder.git] / jjb / bgpcep / bgpcep-csit-throughpcep.yaml

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index 19fb7d746d9bd36366401462d71cf852d0ba664f..0eca8dc68df57172bb3afaec0964ad940c03221e 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-throughpcep
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node-periodic
       # FIXME: Rename job to drop -periodic- and unify job definition with -gate- functionality.
 
     # The project name
@@ -13,8 +13,10 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -39,4 +41,4 @@
         -v UPDATER_TIMEOUT:600
 
     # Controller configuration
-    odl_system_flavor: v1-performance-2
+    odl_system_flavor: v2-standard-4