Merge "Remove odlparent-6.0.x jobs"

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

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index d6d8229f423385b8912ed2f5f023ab09e31fd9fb..acc6bb7916f5cea6b410777380674dc9a15c81fd 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -12,17 +12,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:
@@ -30,7 +28,7 @@
 
     # Features to install
     install-features: >
-      odl-restconf-noauth,
+      odl-restconf,
       odl-bgpcep-bgp,
       odl-bgpcep-bgp-config-example
 
@@ -38,4 +36,4 @@
     robot-options: "-v USE_NETCONF_CONNECTOR:False"
 
     # Controller configuration
-    odl_system_flavor: "odl-standard-4"
+    odl_system_flavor: "v3-standard-4"