Merge "Extract common RPM test builder steps to macro"

[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 ad642be0b98bd5f985fd80bb4bcde5278039b6b1..d3ff23c59c9e294de64d1f2c0b74550854dd4a26 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -14,29 +14,25 @@
     stream:
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-          install-features: 'odl-restconf,odl-bgpcep-bgp-all,odl-bgpcep-bgp,odl-netconf-clustered-topology'
 
     install:
       - all:
           scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf-noauth,odl-bgpcep-bgp,odl-netconf-clustered-topology'
+    install-features: >
+        odl-restconf-noauth,
+        odl-bgpcep-bgp,
+        odl-bgpcep-bgp-config-example,
+        odl-netconf-clustered-topology
 
     # Robot custom options:
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
 
     # Controller configuration
-    odl_system_flavor: '8 GB General Purpose v1'
+    odl_system_flavor: 'v1-performance-4'