Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Move integration/distribution Sonar scan to Sonarcloud"
[releng/builder.git]
/
jjb
/
integration
/
integration-macros.yaml
diff --git
a/jjb/integration/integration-macros.yaml
b/jjb/integration/integration-macros.yaml
index c3e90c3cd3f6e532719ce0ec52d6d78247cde587..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}'
- 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}'
controller-scope: '{controller-scope}'
controller-use-features-boot: '{use-features-boot}'
feature-elasticsearch-attribute: '{elasticsearch-attribute}'
@@
-37,8
+38,9
@@
name: CONTROLLERFEATURES
default: '{controller-features}'
description: |
name: CONTROLLERFEATURES
default: '{controller-features}'
description: |
- Features to install in the controller separated by comma
- (note: extra features such as decanter are inserted in install scripts)
+ 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
- string:
name: CONTROLLERDEBUGMAP
@@
-49,15
+51,21
@@
The levels must be one of: ERROR, WARN, INFO, DEBUG, TRACE.
(ex. ovsdb.lib:ERROR netvirt.vpnservice:INFO)
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.
- string:
name: ELASTICSEARCHATTRIBUTE
default: '{feature-elasticsearch-attribute}'
description: |
Configure the period the script should harvest JVM metrics.
- Default is short.
- Possible values: long (its value is 120000)
- short (its value is 5000)
+ Possible values: long (=120000)
+ short (=5000)
any number between 5000 and 120000
any number between 5000 and 120000
+ disabled (use for disabling harvesting)
- string:
name: USEFEATURESBOOT
- string:
name: USEFEATURESBOOT
@@
-489,7
+497,6
@@
only-critical: false
- integration-csit-archive-build
- integration-csit-run-postscript
only-critical: false
- integration-csit-archive-build
- integration-csit-run-postscript
- - releng-openstack-stack-delete
- publisher:
name: integration-csit-archive-build
- publisher:
name: integration-csit-archive-build