Merge "Switch releng jobs to use mvn35"

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

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index f835ad75778a19ba174eae39de615a9d0e7481cb..76f18bf9e809ab74fa25784a6741539742885b52 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgp-ingest
     jobs:
-      - inttest-csit-1node-periodic
+      - inttest-csit-1node
       # FIXME: Dicument differences from -mixed- and unify into single (matrix) definition.
 
     # The project name
@@ -13,8 +13,10 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -31,8 +33,7 @@
         odl-jolokia,
         odl-bgpcep-data-change-counter,
         odl-bgpcep-bgp,
-        odl-bgpcep-bgp-config-example,
-        odl-netconf-topology
+        odl-bgpcep-bgp-config-example
 
     # Robot custom options:
     robot-options: >
@@ -46,5 +47,5 @@
         -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0
 
     # Controller configuration
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: odl-standard-4