Merge "Remove centinel carbon jobs"

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

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
index e2a60ac03a6d9ae3133d3d3917869c97c9656321..4519cfad54a2d72830ffd97e1a34486dd5966c5f 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -19,9 +19,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
@@ -39,7 +36,7 @@
     # environment or more complex scenario is chosen
     robot-options: >
         -v USE_NETCONF_CONNECTOR:False
-        -v COUNT:1000000
+        -v COUNT:500000
         -v INSERT:10
         -v WITHDRAW:9
         -v PREFILL:10
@@ -47,7 +44,7 @@
         -v TEST_DURATION_MULTIPLIER:4
 
     # Controller configuration
-    odl_system_flavor: v2-standard-2
+    odl_system_flavor: odl-standard-2
 
     # Plot Info
     01-plot-title: 'Number of generated updates'