Merge "Remove odlparent-6.0.x jobs"

[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 89a6bf56f027b479713860c90847cfb35af9c8b2..0933d9a714f6e365c1c85721a3a90c4f340de76d 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -3,7 +3,7 @@
     name: bgpcep-csit-bgp-ingest
     jobs:
       - inttest-csit-1node
-      # FIXME: Dicument differences from -mixed- and unify into single (matrix) definition.
+        # FIXME: Dicument differences from -mixed- and unify into single (matrix) definition.
 
     # The project name
     project: "bgpcep"
@@ -13,17 +13,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"
-      - sodium:
-          branch: "stable/sodium"
 
     install:
       - all:
@@ -49,4 +47,4 @@
       -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0
 
     # Controller configuration
-    odl_system_flavor: odl-standard-4
+    odl_system_flavor: v3-standard-4