Consolidate py2 and py3 requirements files

[releng/builder.git] / jjb / integration / integration-macros.yaml

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 0298a769f059996d85013d6da47ac6546e8e7794..a5fd3c6fec02bf2fe0f5833554881abbf247ab11 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -21,6 +21,7 @@
       - integration-controller-parameters:
           controller-debug-map: '{debug-map}'
           controller-features: '{install-features}'
+          controller-max-mem: '{controller-max-mem}'
           controller-scope: '{controller-scope}'
           controller-use-features-boot: '{use-features-boot}'
           feature-elasticsearch-attribute: '{elasticsearch-attribute}'
@@ -37,7 +38,7 @@
           name: CONTROLLERFEATURES
           default: '{controller-features}'
           description: |
-              Features to install in the controller separated by comma
+              Features to install in the controller separated by comma.
               (note: Do not include decanter* features used for harvesting JVM metrics.
                They are inserted in install scripts.)
 
@@ -50,6 +51,12 @@
               The levels must be one of: ERROR, WARN, INFO, DEBUG, TRACE.
               (ex. ovsdb.lib:ERROR netvirt.vpnservice:INFO)
 
+      - string:
+          name: CONTROLLERMAXMEM
+          default: '{controller-max-mem}'
+          description: |
+              Max Heap size to use when starting the controller.
+
       - string:
           name: ELASTICSEARCHATTRIBUTE
           default: '{feature-elasticsearch-attribute}'