Remove separate features lists

Due to removal of carbon and nitrogen test
this is no longer necessary, and is simply
duplicate code.

Change-Id: I67d50b654def4079acc5a21f2464cd7795eb39f1
Signed-off-by: Tomas Markovic <tomas.markovic@pantheon.tech>

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
index feca52dadd102292be75aa5e886fc7984e64a8b9..248aeec6ebe5dfc808e000838e3bac2e1d0a15a0 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
@@ -14,26 +14,21 @@
     stream:
       - fluorine:
           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
 
     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'