Merge "Make builder jobs use a machine with less RAM"

[releng/builder.git] / jjb / integration / distribution / distribution-csit-userfeatures.yaml

diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
index 745e7ff0645bd44ffb30cf4d1982a22a4afa4ebf..309986336997e9c6463f40e61af2652b256f9502 100644 (file)
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -17,6 +17,13 @@
         - boron:
             branch: 'stable/boron'
             jre: 'openjdk8'
+            install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all,odl-jolokia'
+            robot-options: '-v USE_NETCONF_CONNECTOR:True'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
+            install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all,odl-jolokia'
+            robot-options: '-v USE_NETCONF_CONNECTOR:True'
 
     # TODO: Add Beryllium when everything is backported there.
 
@@ -27,13 +34,10 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all'
+    install-features: 'odl-restconf,odl-distribution-version,odl-netconf-topology,odl-jolokia'
 
     # Robot custom options
-    robot-options: ''
+    robot-options: '-v USE_NETCONF_CONNECTOR:False'
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: >
-        odlparent-distribution-{stream},
-        controller-distribution-{stream},
-        netconf-distribution-{stream}
+    # Controller configuration
+    odl_system_flavor: 8 GB General Purpose v1