Merge "Readjust Calcium 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 b07fe93a6ee54b5dd7b97abafea71746c6689aaf..ca43b4369cd6080c7cd83351433405097750f8ad 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -13,16 +13,12 @@
 
     # Project branches
     stream:
-      - argon:
+      - scandium:
           branch: "master"
-      - chlorine:
-          branch: "stable/chlorine"
-      - sulfur:
-          branch: "stable/sulfur"
-          jre: "openjdk11"
-      - phosphorus:
-          branch: "stable/phosphorus"
-          jre: "openjdk11"
+      - calcium:
+          branch: "stable/calcium"
+      - potassium:
+          branch: "stable/potassium"
 
     karaf-version: bgpcep
 
@@ -34,8 +30,7 @@
     install-features: >
       odl-restconf,
       odl-bgpcep-bgp,
-      odl-bgpcep-bgp-config-example,
-      odl-restconf-nb-bierman02
+      odl-bgpcep-bgp-config-example
 
     # Robot custom options:
     robot-options: "-v USE_NETCONF_CONNECTOR:False"