Merge "Remove odlparent-6.0.x 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 e4ef3b03a7b1ef1f749c7d0efd3db5be1f698168..8ec2890c58109ab895b1eeeb440fafd3659ded54 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -14,15 +14,15 @@
 
     # Project branches
     stream:
-      - silicon:
+      - phosphorus:
           branch: "master"
           jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
       - aluminium:
           branch: "stable/aluminium"
           jre: "openjdk11"
-      - magnesium:
-          branch: "stable/magnesium"
-          jre: "openjdk11"
 
     install:
       - all:
@@ -48,7 +48,7 @@
       -v TEST_DURATION_MULTIPLIER:4
 
     # Controller configuration
-    odl_system_flavor: odl-standard-4
+    odl_system_flavor: v3-standard-4
 
     # Plot Info
     01-plot-title: "Number of generated updates"