Merge "Do not trigger distribution-merge by controller"

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

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
index 137abb967c639bcbf853476298f40e0f43a60b9b..15d27ff9099aad19bb274bd84437bda3c9133127 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
@@ -12,41 +12,27 @@
 
     # Project branches
     stream:
-      - fluorine:
+      - aluminium:
           branch: 'master'
-          install-features: >
-              odl-restconf,
-              odl-bgpcep-bgp,
-              odl-bgpcep-bgp-config-example,
-              odl-bgpcep-bmp,
-              odl-bgpcep-bmp-config-example,
-              odl-bgpcep-pcep
-      - oxygen:
-          branch: 'stable/oxygen'
-          install-features: >
-              odl-restconf,
-              odl-bgpcep-bgp,
-              odl-bgpcep-bgp-config-example,
-              odl-bgpcep-bmp,
-              odl-bgpcep-bmp-config-example,
-              odl-bgpcep-pcep
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          install-features: >
-              odl-restconf,
-              odl-bgpcep-bgp,
-              odl-bgpcep-bgp-config-example
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-          install-features: >
-              odl-restconf,
-              odl-bgpcep-bgp,
-              odl-bgpcep-bgp-config-example
+          jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
+      - sodium:
+          branch: 'stable/sodium'
 
     install:
       - only:
           scope: 'only'
 
+    # Features to install
+    install-features: >
+        odl-restconf,
+        odl-bgpcep-bgp,
+        odl-bgpcep-bgp-config-example,
+        odl-bgpcep-bmp,
+        odl-bgpcep-bmp-config-example,
+        odl-bgpcep-pcep
+
     # Robot custom options:
     robot-options: '-v USE_NETCONF_CONNECTOR:False'