From: Jamo Luhrsen Date: Sat, 8 Feb 2020 00:11:21 +0000 (-0800) Subject: Make controller max mem a jenkins config knob X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=a0ee6ed5d2ac5f8bb71867571ea77bd9ec2ca290;p=releng%2Fbuilder.git Make controller max mem a jenkins config knob Signed-off-by: Jamo Luhrsen Change-Id: If978c3b4e68aeea2499f37317061ef42918f379b --- diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh index b68bdc0d7..e7a7b4afb 100644 --- a/jjb/integration/common-functions.sh +++ b/jjb/integration/common-functions.sh @@ -10,7 +10,7 @@ export FEATURESCONF=/tmp/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg export CUSTOMPROP=/tmp/${BUNDLEFOLDER}/etc/custom.properties export LOGCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg export MEMCONF=/tmp/${BUNDLEFOLDER}/bin/setenv -export CONTROLLERMEM="2048m" +export CONTROLLERMEM=${CONTROLLERMAXMEM} # Cluster specific configuration settings export AKKACONF=/tmp/${BUNDLEFOLDER}/configuration/initial/akka.conf @@ -464,6 +464,7 @@ DISTROSTREAM: ${DISTROSTREAM} BUNDLE_URL: ${BUNDLE_URL} CONTROLLERFEATURES: ${CONTROLLERFEATURES} CONTROLLERDEBUGMAP: ${CONTROLLERDEBUGMAP} +CONTROLLERMAXMEM: ${CONTROLLERMAXMEM} SCRIPTPLAN: ${SCRIPTPLAN} CONFIGPLAN: ${CONFIGPLAN} STREAMTESTPLAN: ${STREAMTESTPLAN} @@ -857,7 +858,12 @@ function get_nodes_list() { function get_features() { if [ "${CONTROLLERSCOPE}" == 'all' ]; then ACTUALFEATURES="odl-integration-compatible-with-all,${CONTROLLERFEATURES}" - export CONTROLLERMEM="3072m" + # if CONTROLLERMEM still is the default 2G and was not overridden by a + # custom job, then we need to make sure to increase it because "all" + # features can be heavy + if [ "${CONTROLLERMEM}" == "2048m" ]; then + export CONTROLLERMEM="3072m" + fi else ACTUALFEATURES="odl-infrautils-ready,${CONTROLLERFEATURES}" fi diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml index 4abf4ee46..b7019f854 100644 --- a/jjb/integration/distribution/distribution-templates.yaml +++ b/jjb/integration/distribution/distribution-templates.yaml @@ -423,6 +423,7 @@ - integration-controller-parameters: controller-features: '{sm-features}' # Parameters below are unused in this job so set them all to blank + controller-max-mem: '' controller-debug-map: '' controller-scope: '' controller-use-features-boot: '' diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index 0298a769f..a5fd3c6fe 100644 --- 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}' diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index f0165cf61..21ec2f737 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -79,6 +79,7 @@ odl_system_flavor: 'odl-highcpu-4' odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' + controller-max-mem: '2048m' tools_system_count: 1 tools_system_flavor: 'odl-highcpu-2' tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' @@ -98,6 +99,7 @@ robot-options: '{robot-options}' # Controller controller-scope: only + controller-max-mem: '{controller-max-mem}' debug-map: '{debug-map}' install-features: '{install-features}' use-features-boot: 'True' @@ -186,6 +188,7 @@ odl_system_flavor: 'odl-highcpu-4' odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' + controller-max-mem: '2048m' tools_system_count: 1 tools_system_flavor: 'odl-highcpu-2' tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' @@ -206,6 +209,7 @@ robot-options: '{robot-options}' # Controller controller-scope: '{scope}' + controller-max-mem: '{controller-max-mem}' debug-map: '{debug-map}' install-features: '{install-features}' use-features-boot: 'True' @@ -444,6 +448,7 @@ robot-options: '{robot-options}' # Controller controller-scope: '{scope}' + controller-max-mem: '{controller-max-mem}' debug-map: '{debug-map}' install-features: '{install-features}' use-features-boot: 'True' @@ -492,6 +497,7 @@ odl_system_flavor: 'odl-highcpu-4' odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' + controller-max-mem: '2048m' tools_system_count: 1 tools_system_flavor: 'odl-highcpu-2' tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' @@ -511,6 +517,7 @@ robot-options: '{robot-options}' # Controller controller-scope: only + controller-max-mem: '{controller-max-mem}' debug-map: '{debug-map}' install-features: 'odl-jolokia,{install-features}' use-features-boot: 'True' @@ -602,6 +609,7 @@ odl_system_flavor: 'odl-highcpu-4' odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' + controller-max-mem: '2048m' tools_system_count: 1 tools_system_flavor: 'odl-highcpu-2' tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-28 - 20190415-091034.881' @@ -621,6 +629,7 @@ robot-options: '{robot-options}' # Controller controller-scope: '{scope}' + controller-max-mem: '{controller-max-mem}' debug-map: '{debug-map}' install-features: 'odl-jolokia,{install-features}' use-features-boot: 'True' @@ -860,6 +869,7 @@ robot-options: '{robot-options}' # Controller controller-scope: '{scope}' + controller-max-mem: '{controller-max-mem}' debug-map: '{debug-map}' install-features: 'odl-jolokia,{install-features}' use-features-boot: 'True' @@ -909,6 +919,7 @@ odl_system_count: 1 odl_system_flavor: 'odl-highcpu-4' odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' + controller-max-mem: '2048m' docker_system_count: 1 docker_system_flavor: 'odl-standard-1' docker_system_image: 'ZZCI - CentOS 7 - docker - x86_64 - 20191004-045622.840' @@ -928,6 +939,7 @@ robot-options: '{robot-options}' # Controller controller-scope: '{scope}' + controller-max-mem: '{controller-max-mem}' debug-map: '{debug-map}' install-features: 'odl-jolokia,{install-features}' use-features-boot: 'True' @@ -1042,6 +1054,7 @@ odl_system_count: 1 odl_system_flavor: 'odl-highcpu-4' odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' + controller-max-mem: '2048m' openstack_system_count: 1 openstack_system_flavor: 'odl-standard-4' openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485' @@ -1067,6 +1080,7 @@ robot-options: '{robot-options}' # Controller controller-scope: '' + controller-max-mem: '{controller-max-mem}' debug-map: '{debug-map}' install-features: '{install-features}' use-features-boot: '{use-features-boot}' @@ -1286,6 +1300,7 @@ robot-options: '{robot-options}' # Controller controller-scope: '' + controller-max-mem: '{controller-max-mem}' debug-map: '{debug-map}' install-features: '{install-features}' use-features-boot: '{use-features-boot}' @@ -1456,6 +1471,7 @@ odl_system_count: 1 odl_system_flavor: 'odl-highcpu-4' odl_system_image: 'ZZCI - CentOS 7 - builder - x86_64 - 20191201-060129.829' + controller-max-mem: '2048m' openstack_system_count: 1 openstack_system_flavor: 'odl-standard-4' openstack_system_image: 'ZZCI - CentOS 7 - devstack - x86_64 - 20191004-045548.485' @@ -1481,6 +1497,7 @@ robot-options: '{robot-options}' # Controller controller-scope: '' + controller-max-mem: '{controller-max-mem}' debug-map: '{debug-map}' install-features: '{install-features}' use-features-boot: '{use-features-boot}' @@ -1704,6 +1721,7 @@ robot-options: '{robot-options}' # Controller controller-scope: '' + controller-max-mem: '{controller-max-mem}' debug-map: '{debug-map}' install-features: '{install-features}' use-features-boot: '{use-features-boot}' @@ -1990,6 +2008,7 @@ openstack-cloud: vex openstack-heat-template: csit-apex-3-instance-type.yaml openstack-heat-template-dir: openstack-hot + controller-max-mem: '2048m' ##################### # Job configuration # @@ -2006,6 +2025,7 @@ robot-options: '{robot-options}' # Controller controller-scope: '' + controller-max-mem: '{controller-max-mem}' debug-map: '{debug-map}' install-features: '{install-features}' use-features-boot: '{use-features-boot}' @@ -2129,6 +2149,7 @@ robot-options: '{robot-options}' # Controller controller-scope: '' + controller-max-mem: '{controller-max-mem}' debug-map: '{debug-map}' install-features: '{install-features}' use-features-boot: '{use-features-boot}'