Merge "Extract common RPM test builder steps to macro"

[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 a65c61db2f69894f5a29e5d4c82a5dad605fdab2..2ba4c45cacf67076f2dfad516eda5a542678dec5 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
@@ -12,24 +12,33 @@
 
     # Project branches
     stream:
-      - carbon:
+      - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
           install-features: >
               odl-restconf,
-              odl-bgpcep-bgp-all,
               odl-bgpcep-bgp,
-              odl-netconf-clustered-topology
+              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
 
     install:
       - only:
           scope: 'only'
 
-    # Features to install
-    install-features: 'odl-restconf,odl-bgpcep-bgp'
-
     # Robot custom options:
     robot-options: '-v USE_NETCONF_CONNECTOR:False'