Merge "Remove bgpcep carbon jobs"

[releng/builder.git] / jjb / bgpcep / bgpcep-csit-bgp-gate-ingest-mixed.yaml

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
index c0441af51a0d0a401d5e656be0754f4b09a488ee..210728107287a07bdc16078cacea12f5e0d91e75 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
@@ -12,13 +12,12 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
@@ -44,7 +43,7 @@
         -v TEST_DURATION_MULTIPLIER:4
 
     # Controller configuration
-    odl_system_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-4
 
     # Plot Info
     01-plot-title: 'Number of generated updates'