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 53c400f6008e554428a60f1e866f8ed214e5fe73..309986336997e9c6463f40e61af2652b256f9502 100644 (file)
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -39,11 +39,5 @@
     # Robot custom options
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: >
-        controller-distribution-{stream},
-        integration-distribution-merge-{stream}
-
     # Controller configuration
-    controller-image: 'centos7-java-builder-2c-8g'
-
+    odl_system_flavor: 8 GB General Purpose v1