Merge "Fix genius CSIT jobs"

[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 8cf9a9682a5da815d717e6d60da8f66379f848dc..3f5f7270fa8087d994683174402ccd42dbe2d195 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgpclustering-ha
     jobs:
-      - '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-3node-periodic
 
     # The project name
     project: 'bgpcep'
@@ -14,21 +14,31 @@
     stream:
       - oxygen:
           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
+
       - 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,
-        odl-bgpcep-bgp-config-example
-
     # Robot custom options:
     robot-options: '-v USE_NETCONF_CONNECTOR:False'