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 5a1922fb17acdc84076aa1b066c54d6d4fa5c280..a5fd3c6fec02bf2fe0f5833554881abbf247ab11 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -21,8 +21,10 @@
       - 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}'
 
 - parameter:
     name: integration-controller-parameters
@@ -35,7 +37,10 @@
       - string:
           name: CONTROLLERFEATURES
           default: '{controller-features}'
-          description: 'Features to install in the controller separated by comma'
+          description: |
+              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.)
 
       - string:
           name: CONTROLLERDEBUGMAP
@@ -46,6 +51,22 @@
               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}'
+          description: |
+              Configure the period the script should harvest JVM metrics.
+              Possible values: long (=120000)
+                               short (=5000)
+                               any number between 5000 and 120000
+                               disabled (use for disabling harvesting)
+
       - string:
           name: USEFEATURESBOOT
           default: '{controller-use-features-boot}'
@@ -76,9 +97,7 @@
       - string:
           name: BUNDLE_URL
           default: '{bundle-url}'
-          description: |
-              Karaf distribution zip URL. Use last for last distribution in Nexus,
-              use autorelease for last stable AR job distribution.
+          description: 'URL to karaf distribution zip'
 
 - parameter:
     name: integration-repo-url
@@ -478,7 +497,6 @@
           only-critical: false
       - integration-csit-archive-build
       - integration-csit-run-postscript
-      - releng-openstack-stack-delete
 
 - publisher:
     name: integration-csit-archive-build
@@ -505,6 +523,7 @@
                         mv karaf_${i}_*_threads* ${NODE_FOLDER} || true
                         mv *_${i}.png ${NODE_FOLDER} || true
                         mv /tmp/odl${i}_* ${NODE_FOLDER} || true
+                        mv gclogs-${i} ${NODE_FOLDER} || true
                     done
                     curl --output robot-plugin.zip "$BUILD_URL/robot/report/*zip*/robot-plugin.zip"
                     unzip -d ./archives robot-plugin.zip