Merge "Add gre type driver for dc-gw and tdd cases"

[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 6d6190a2718b4607fe0a4cfda6de08c1f68cc814..2a6b8cc6ccaab8b5cc0d378ef30b17bc66a28704 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -2,24 +2,24 @@
 - project:
     name: bgpcep-csit-bgp-ingest-mixed
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-      # FIXME: Rename job to drop -periodic- and unify job definition with -gate- functionality.
+      - inttest-csit-1node
 
     # The project name
     project: 'bgpcep'
 
     # The functionality under test
-    functionality: 'bgp-ingest-mixed'
+    functionality:
+      - bgp-ingest-mixed
+      - gate-bgp-ingest-mixed
 
     # Project branches
     stream:
-      - oxygen:
+      - sodium:
           branch: 'master'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+      - neon:
+          branch: 'stable/neon'
+      - fluorine:
+          branch: 'stable/fluorine'
 
     install:
       - all:
@@ -29,15 +29,15 @@
     install-features: >
         odl-restconf,
         odl-bgpcep-bgp,
-        odl-bgpcep-data-change-counter,
-        odl-netconf-topology
+        odl-bgpcep-bgp-config-example,
+        odl-bgpcep-data-change-counter
 
     # Robot custom options
     # Increase the TEST_DURATION_MULTIPLIER if the test runs in slower test
     # 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
@@ -45,7 +45,7 @@
         -v TEST_DURATION_MULTIPLIER:4
 
     # Controller configuration
-    odl_system_flavor: 8 GB General Purpose v1
+    odl_system_flavor: odl-standard-4
 
     # Plot Info
     01-plot-title: 'Number of generated updates'