From a95c8644b21d57dd0d0519b2ef4cefd0da1ad3dc Mon Sep 17 00:00:00 2001 From: Stanislav Chlebec Date: Fri, 25 Oct 2019 19:33:42 +0200 Subject: [PATCH] add support for JVM monitoring in common-functions.sh - function get_features: add decanter-collector-jmx,decanter-appender-elasticsearch to the variable to allow the proper decanter feature installation - the new function add_jvm_support(): allow executing of scripts .../test/csit/scripts/set_elasticsearch_attribute_short.sh (or ...long.sh) .../test/csit/scripts/set_jvm_common_attribute.sh for allow decanter & elasticsearch configuration & installation and eliminate the need to list them in scriptplans files (in the folder integration/test/csit/scriptplans) This function is called from scripts integration-configure-clustering.sh and integration-deploy-controller-run-test.sh - function get_test_suites: added python call to generate plots to eliminate the need to list integration/test/csit/suites/integration/Create_JVM_Plots.robot in testplans (in the folder integration/test/csit/testplans) jenkins job parameters - update description of parameter CONTROLLERFEATURES - create the new parameter ELASTICSEARCHATTRIBUTE ELASTICSEARCHATTRIBUTE will serve for indicating how to set elasticsearch attribute while calling of respective shell script from releng/builder/jjb/integration/common-functions.sh function run_plan get rid of explicit mentions of decantor related features in current yaml files elasticsearch-attribute - set default to short in jjb/defaults.yaml - set value to long in all projects which contain the longevity functionality - new job parameter ELASTICSEARCHATTRIBUTE inserted to the integration-controller-parameters macro in jjb/integration/integration-macros.yaml - adding setting of the new parameter to each template (reffering the integration-csit-parameters macro) in jjb/integration/integration-templates.yaml - adding setting of the new parameter to the template refering the integration-controller-parameters macro in jjb/integration/distribution/distribution-templates.yaml JIRA: INTTEST-14 Signed-off-by: Stanislav Chlebec Change-Id: I3745ac190563ccaab03d4ce8e49f1bfd53eb8b56 --- .../bgpcep-csit-bgpclustering-longevity.yaml | 3 +++ .../controller-csit-cs-chasing-leader.yaml | 3 +++ .../controller-csit-cs-partnheal.yaml | 3 +++ ...ontroller-csit-ddb-expl-lead-movement.yaml | 3 +++ .../controller-csit-dnb-noloss.yaml | 3 +++ .../controller-csit-drb-partnheal.yaml | 3 +++ .../controller-csit-drb-precedence.yaml | 3 +++ jjb/defaults.yaml | 3 +++ jjb/integration/common-functions.sh | 26 +++++++++++++++++++ .../distribution/distribution-templates.yaml | 1 + .../integration-configure-clustering.sh | 2 ++ .../integration-deploy-controller-run-test.sh | 2 ++ jjb/integration/integration-macros.yaml | 15 ++++++++++- jjb/integration/integration-templates.yaml | 14 ++++++++++ jjb/netconf/netconf-scale.yaml | 4 +-- .../netvirt-csit-hwvtep-openstack.yaml | 12 ++++----- jjb/netvirt/netvirt-csit-multi-apex.yaml | 2 +- .../netvirt-csit-multi-openstack-upgrade.yaml | 2 +- jjb/netvirt/netvirt-csit-multi-openstack.yaml | 16 ++++++------ ...lugin-csit-clustering-perf-bulkomatic.yaml | 4 +-- .../openflowplugin-csit-longevity.yaml | 7 ++--- .../openflowplugin-csit-perf-bulkomatic.yaml | 4 +-- .../openflowplugin-csit-scale-link.yaml | 4 +-- .../openflowplugin-csit-scale-switch.yaml | 4 +-- .../openflowplugin-csit-scale.yaml | 4 +-- jjb/ovsdb/ovsdb-csit-clustering.yaml | 2 +- 26 files changed, 110 insertions(+), 39 deletions(-) diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index 40c415b60..a47678663 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -10,6 +10,9 @@ # The functionality under test functionality: 'bgpclustering-longevity' + # Set elasticsearch attribute to value 'long' for longevity jobs + elasticsearch-attribute: 'long' + # Project branches stream: - magnesium: diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index 0d3e99feb..8bec36757 100644 --- a/jjb/controller/controller-csit-cs-chasing-leader.yaml +++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml @@ -10,6 +10,9 @@ # The functionality under test functionality: 'cs-chasing-leader-longevity' + # Set elasticsearch attribute to value 'long' for longevity jobs + elasticsearch-attribute: 'long' + # Project branches stream: - magnesium: diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index 8a9eadeeb..5e86ed213 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -10,6 +10,9 @@ # The functionality under test functionality: 'cs-partnheal-longevity' + # Set elasticsearch attribute to value 'long' for longevity jobs + elasticsearch-attribute: 'long' + # Project branches stream: - magnesium: diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml index 6945d2295..789671ee3 100644 --- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml +++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml @@ -10,6 +10,9 @@ # The functionality under test functionality: 'ddb-expl-lead-movement-longevity' + # Set elasticsearch attribute to value 'long' for longevity jobs + elasticsearch-attribute: 'long' + # Project branches stream: - magnesium: diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index 6d10daff1..d929a664c 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -10,6 +10,9 @@ # The functionality under test functionality: 'notifications-longevity' + # Set elasticsearch attribute to value 'long' for longevity jobs + elasticsearch-attribute: 'long' + # Project branches stream: - magnesium: diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 14b16a89e..08f0269d5 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -10,6 +10,9 @@ # The functionality under test functionality: 'drb-partnheal-longevity' + # Set elasticsearch attribute to value 'long' for longevity jobs + elasticsearch-attribute: 'long' + # Project branches stream: - magnesium: diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index ed057052f..a82d48819 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -10,6 +10,9 @@ # The functionality under test functionality: 'drb-precedence-longevity' + # Set elasticsearch attribute to value 'long' for longevity jobs + elasticsearch-attribute: 'long' + # Project branches stream: - magnesium: diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index f4b36978e..bff3a9846 100644 --- a/jjb/defaults.yaml +++ b/jjb/defaults.yaml @@ -82,6 +82,9 @@ sm-repos: '' sm-features: '' + # Elasticsearch attribute + elasticsearch-attribute: 'short' + # CSIT images configuration openstack_rocky_system_image: ZZCI - CentOS 7 - devstack-rocky - x86_64 - 20191002-183226.559 openstack_queens_system_image: ZZCI - CentOS 7 - devstack-queens - x86_64 - 20191004-045555.756 diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh index e38b07ae0..c33a9b050 100644 --- a/jjb/integration/common-functions.sh +++ b/jjb/integration/common-functions.sh @@ -223,6 +223,10 @@ function get_test_suites() { testplan_filepath="${WORKSPACE}/test/csit/testplans/${TESTPLAN}" fi + add_test="integration/test/csit/suites/integration/Create_JVM_Plots.robot" # we should always add for preparing JVM monitoring + echo >> "$testplan_filepath" + echo "${add_test}" >> "$testplan_filepath" + echo "Changing the testplan path..." sed "s:integration:${WORKSPACE}:" "${testplan_filepath}" > testplan.txt cat testplan.txt @@ -282,6 +286,25 @@ function run_plan() { printf "Finished running %s plans\\n" "${type}" } # function run_plan() +# Run scripts to support JVM monitoring. +function add_jvm_support() +{ + # TODO unite short and long version to one script and parametrize the input: short/long/any number + if [ "${ELASTICSEARCHATTRIBUTE}" == "short" ]; then + run_script="${WORKSPACE}/test/csit/scripts/set_elasticsearch_attribute_short.sh" + else + run_script="${WORKSPACE}/test/csit/scripts/set_elasticsearch_attribute_long.sh" + fi + printf "Executing %s...\\n" "${run_script}" + # shellcheck source=${line} disable=SC1091 + source "${run_script}" + + run_script="${WORKSPACE}/test/csit/scripts/set_jvm_common_attribute.sh" + printf "Executing %s...\\n" "${run_script}" + # shellcheck source=${line} disable=SC1091 + source "${run_script}" +} # function add_jvm_support() + # Return elapsed time. Usage: # - Call first time with no arguments and a new timer is returned. # - Next call with the first argument as the timer and the elapsed time is returned. @@ -738,6 +761,9 @@ function get_features() { ACTUALFEATURES="odl-infrautils-ready,${CONTROLLERFEATURES}" fi + # Add decanter features to allow JVM monitoring + ACTUALFEATURES="${ACTUALFEATURES},decanter-collector-jmx,decanter-appender-elasticsearch" + # Some versions of jenkins job builder result in feature list containing spaces # and ending in newline. Remove all that. ACTUALFEATURES=$(echo "${ACTUALFEATURES}" | tr -d '\n \r') diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml index 7fc1f740d..4abf4ee46 100644 --- a/jjb/integration/distribution/distribution-templates.yaml +++ b/jjb/integration/distribution/distribution-templates.yaml @@ -426,6 +426,7 @@ controller-debug-map: '' controller-scope: '' controller-use-features-boot: '' + feature-elasticsearch-attribute: '{elasticsearch-attribute}' - integration-jdk-version: jdkversion: '{jre}' - distribution-karaf-version: diff --git a/jjb/integration/integration-configure-clustering.sh b/jjb/integration/integration-configure-clustering.sh index 33f7b5463..0fdcb9c58 100644 --- a/jjb/integration/integration-configure-clustering.sh +++ b/jjb/integration/integration-configure-clustering.sh @@ -18,6 +18,8 @@ nodes_list=$(get_nodes_list) run_plan "script" +add_jvm_support + create_configuration_script create_startup_script diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh index 3a274190d..55dd10397 100755 --- a/jjb/integration/integration-deploy-controller-run-test.sh +++ b/jjb/integration/integration-deploy-controller-run-test.sh @@ -18,6 +18,8 @@ nodes_list=$(get_nodes_list) run_plan "script" +add_jvm_support + create_configuration_script create_startup_script diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index c31de85f5..c3e90c3cd 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -23,6 +23,7 @@ controller-features: '{install-features}' controller-scope: '{controller-scope}' controller-use-features-boot: '{use-features-boot}' + feature-elasticsearch-attribute: '{elasticsearch-attribute}' - parameter: name: integration-controller-parameters @@ -35,7 +36,9 @@ - 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: extra features such as decanter are inserted in install scripts) - string: name: CONTROLLERDEBUGMAP @@ -46,6 +49,16 @@ The levels must be one of: ERROR, WARN, INFO, DEBUG, TRACE. (ex. ovsdb.lib:ERROR netvirt.vpnservice:INFO) + - 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) + any number between 5000 and 120000 + - string: name: USEFEATURESBOOT default: '{controller-use-features-boot}' diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index a1e46356b..bfac98942 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -101,6 +101,7 @@ debug-map: '{debug-map}' install-features: '{install-features}' use-features-boot: 'True' + elasticsearch-attribute: '{elasticsearch-attribute}' - integration-stack-2-type: vm_0_count: 1 vm_0_flavor: '{odl_system_flavor}' @@ -189,6 +190,7 @@ tools_system_flavor: 'odl-highcpu-2' tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20190416-121328.240' + ##################### # Job configuration # ##################### @@ -207,6 +209,7 @@ debug-map: '{debug-map}' install-features: '{install-features}' use-features-boot: 'True' + elasticsearch-attribute: '{elasticsearch-attribute}' - integration-stack-2-type: vm_0_count: 1 vm_0_flavor: '{odl_system_flavor}' @@ -444,6 +447,7 @@ debug-map: '{debug-map}' install-features: '{install-features}' use-features-boot: 'True' + elasticsearch-attribute: '{elasticsearch-attribute}' - integration-stack-2-type: vm_0_count: 1 vm_0_flavor: '{odl_system_flavor}' @@ -510,6 +514,7 @@ debug-map: '{debug-map}' install-features: 'odl-jolokia,{install-features}' use-features-boot: 'True' + elasticsearch-attribute: '{elasticsearch-attribute}' - integration-stack-2-type: vm_0_count: 3 vm_0_flavor: '{odl_system_flavor}' @@ -619,6 +624,7 @@ debug-map: '{debug-map}' install-features: 'odl-jolokia,{install-features}' use-features-boot: 'True' + elasticsearch-attribute: '{elasticsearch-attribute}' - integration-stack-2-type: vm_0_count: 3 vm_0_flavor: '{odl_system_flavor}' @@ -857,6 +863,7 @@ debug-map: '{debug-map}' install-features: 'odl-jolokia,{install-features}' use-features-boot: 'True' + elasticsearch-attribute: '{elasticsearch-attribute}' - integration-stack-2-type: vm_0_count: 3 vm_0_flavor: '{odl_system_flavor}' @@ -924,6 +931,7 @@ debug-map: '{debug-map}' install-features: 'odl-jolokia,{install-features}' use-features-boot: 'True' + elasticsearch-attribute: '{elasticsearch-attribute}' - integration-stack-2-type: vm_0_count: 3 vm_0_flavor: '{odl_system_flavor}' @@ -1062,6 +1070,7 @@ debug-map: '{debug-map}' install-features: '{install-features}' use-features-boot: '{use-features-boot}' + elasticsearch-attribute: '{elasticsearch-attribute}' - integration-stack-4-type: vm_0_count: '{odl_system_count}' vm_0_flavor: '{odl_system_flavor}' @@ -1280,6 +1289,7 @@ debug-map: '{debug-map}' install-features: '{install-features}' use-features-boot: '{use-features-boot}' + elasticsearch-attribute: '{elasticsearch-attribute}' - integration-stack-4-type: vm_0_count: '{odl_system_count}' vm_0_flavor: '{odl_system_flavor}' @@ -1474,6 +1484,7 @@ debug-map: '{debug-map}' install-features: '{install-features}' use-features-boot: '{use-features-boot}' + elasticsearch-attribute: '{elasticsearch-attribute}' - integration-stack-4-type: vm_0_count: '{odl_system_count}' vm_0_flavor: '{odl_system_flavor}' @@ -1696,6 +1707,7 @@ debug-map: '{debug-map}' install-features: '{install-features}' use-features-boot: '{use-features-boot}' + elasticsearch-attribute: '{elasticsearch-attribute}' - integration-stack-4-type: vm_0_count: '{odl_system_count}' vm_0_flavor: '{odl_system_flavor}' @@ -1997,6 +2009,7 @@ debug-map: '{debug-map}' install-features: '{install-features}' use-features-boot: '{use-features-boot}' + elasticsearch-attribute: '{elasticsearch-attribute}' - integration-stack-3-type: vm_0_count: '{apex_controller_count}' vm_0_flavor: '{apex_controller_flavor}' @@ -2119,6 +2132,7 @@ debug-map: '{debug-map}' install-features: '{install-features}' use-features-boot: '{use-features-boot}' + elasticsearch-attribute: '{elasticsearch-attribute}' - integration-stack-3-type: vm_0_count: '{apex_controller_count}' vm_0_flavor: '{apex_controller_flavor}' diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index eebbfe58c..64ddbd207 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -68,9 +68,7 @@ odl-clustering-test-app, odl-netconf-mdsal, odl-netconf-topology, - odl-jolokia, - decanter-collector-jmx, - decanter-appender-elasticsearch + odl-jolokia # Robot custom options robot-options: '-v USE_NETCONF_CONNECTOR:False' diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index 357a6e6fb..4d98bd450 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -30,12 +30,12 @@ openstack_system2_count: 2 odl_system_count: 1 enable-haproxy: 'no' - install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' + install-features: 'odl-netvirt-openstack' - 3node: openstack_system2_count: 3 odl_system_count: 3 enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' + install-features: 'odl-jolokia,odl-netvirt-openstack' functionality: - upstream-stateful @@ -79,12 +79,12 @@ openstack_system2_count: 2 odl_system_count: 1 enable-haproxy: 'no' - install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' + install-features: 'odl-netvirt-openstack' - 3node: openstack_system2_count: 3 odl_system_count: 3 enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' + install-features: 'odl-jolokia,odl-netvirt-openstack' functionality: - upstream-stateful @@ -128,12 +128,12 @@ openstack_system2_count: 2 odl_system_count: 1 enable-haproxy: 'no' - install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' + install-features: 'odl-netvirt-openstack' - 3node: openstack_system2_count: 3 odl_system_count: 3 enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' + install-features: 'odl-jolokia,odl-netvirt-openstack' functionality: - upstream-stateful diff --git a/jjb/netvirt/netvirt-csit-multi-apex.yaml b/jjb/netvirt/netvirt-csit-multi-apex.yaml index cf6ea9a0a..3b23bbf1a 100644 --- a/jjb/netvirt/netvirt-csit-multi-apex.yaml +++ b/jjb/netvirt/netvirt-csit-multi-apex.yaml @@ -23,7 +23,7 @@ topology: '1node' - install-features: 'odl-netvirt-openstack, decanter-collector-jmx, decanter-appender-elasticsearch, odl-mdsal-trace' + install-features: 'odl-netvirt-openstack, odl-mdsal-trace' public-bridge: 'br-datacentre' public-physical-network: 'datacentre' diff --git a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml index ed750dc49..4ed7f4ff1 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml @@ -31,7 +31,7 @@ openstack_system2_count: 2 odl_system_count: 1 enable-haproxy: 'no' - install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' + install-features: 'odl-netvirt-openstack' functionality: - upgrade diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index 7d114f87e..84a1f5ed1 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml @@ -26,13 +26,13 @@ openstack_system2_count: 2 odl_system_count: 1 enable-haproxy: 'no' - install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' + install-features: 'odl-netvirt-openstack' robot-options: '-v FAIL_ON_EXCEPTIONS:True' - 3node: openstack_system2_count: 3 odl_system_count: 3 enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' + install-features: 'odl-jolokia,odl-netvirt-openstack' functionality: - upstream-stateful @@ -114,13 +114,13 @@ openstack_system2_count: 2 odl_system_count: 1 enable-haproxy: 'no' - install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' + install-features: 'odl-netvirt-openstack' robot-options: '-v FAIL_ON_EXCEPTIONS:True' - 3node: openstack_system2_count: 3 odl_system_count: 3 enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' + install-features: 'odl-jolokia,odl-netvirt-openstack' functionality: - upstream-stateful @@ -202,13 +202,13 @@ openstack_system2_count: 2 odl_system_count: 1 enable-haproxy: 'no' - install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' + install-features: 'odl-netvirt-openstack' robot-options: '-v FAIL_ON_EXCEPTIONS:True' - 3node: openstack_system2_count: 3 odl_system_count: 3 enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' + install-features: 'odl-jolokia,odl-netvirt-openstack' functionality: - upstream-stateful @@ -328,13 +328,13 @@ openstack_system2_count: 0 odl_system_count: 1 enable-haproxy: 'no' - install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' + install-features: 'odl-netvirt-openstack' robot-options: '-v FAIL_ON_EXCEPTIONS:True' - 3node: openstack_system2_count: 1 odl_system_count: 3 enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch' + install-features: 'odl-jolokia,odl-netvirt-openstack' functionality: - upstream-stateful diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index 81a810814..550864c2b 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml @@ -33,9 +33,7 @@ install-features: > odl-openflowplugin-flow-services-rest, odl-openflowplugin-app-bulk-o-matic, - odl-jolokia, - decanter-collector-jmx, - decanter-appender-elasticsearch + odl-jolokia # Robot custom options robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count_per_switch:2250' diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 0b9f4d455..805082cab 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -11,6 +11,9 @@ # The functionality under test functionality: 'longevity' + # Set elasticsearch attribute to value 'long' for longevity jobs + elasticsearch-attribute: 'long' + # Project branches stream: - magnesium: @@ -31,9 +34,7 @@ # Features to install install-features: > odl-openflowplugin-flow-services-rest, - odl-openflowplugin-app-table-miss-enforcer, - decanter-collector-jmx, - decanter-appender-elasticsearch + odl-openflowplugin-app-table-miss-enforcer # Robot custom options robot-options: '-v TEST_LENGTH:23h -v NUM_SWITCHES:16' diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index 6f8689db9..df510fc99 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -33,9 +33,7 @@ install-features: > odl-openflowplugin-flow-services-rest, odl-openflowplugin-app-bulk-o-matic, - odl-jolokia, - decanter-collector-jmx, - decanter-appender-elasticsearch + odl-jolokia # Robot custom options robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count_per_switch:3125' diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index 8694eae49..408a310aa 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -30,9 +30,7 @@ # Features to install install-features: > odl-openflowplugin-flow-services-rest, - odl-openflowplugin-app-table-miss-enforcer, - decanter-collector-jmx, - decanter-appender-elasticsearch + odl-openflowplugin-app-table-miss-enforcer # Robot custom options robot-options: '' diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index accf402b5..8cf859bb3 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -29,9 +29,7 @@ # Features to install install-features: > - odl-openflowplugin-flow-services-rest, - decanter-collector-jmx, - decanter-appender-elasticsearch + odl-openflowplugin-flow-services-rest # Robot custom options robot-options: '' diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index 3b99f4549..ce2c18247 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -32,9 +32,7 @@ # Features to install install-features: > odl-openflowplugin-flow-services-rest, - odl-openflowplugin-app-table-miss-enforcer, - decanter-collector-jmx, - decanter-appender-elasticsearch + odl-openflowplugin-app-table-miss-enforcer # Robot custom options robot-options: '-v TOPO_TREE_DEPTH:7' diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index 75fa4a6a3..5a8ecae80 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -27,7 +27,7 @@ scope: 'only' # Features to install - install-features: 'odl-ovsdb-southbound-impl-rest,decanter-collector-jmx,decanter-appender-elasticsearch' + install-features: 'odl-ovsdb-southbound-impl-rest' # Robot custom options robot-options: '' -- 2.36.6