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 <stanislav.chlebec@pantheon.tech>
Change-Id: I3745ac190563ccaab03d4ce8e49f1bfd53eb8b56

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml
index 40c415b604d9488734323909b2f71c6e4288e368..a476786637b8998a19b3be2e85dc2091d8b6c2af 100644 (file)
--- 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 0d3e99feb7cd63d899bb2823051d7c9e2a7db561..8bec36757ea2e9d8701fe8c199606e3a90c6f5a0 100644 (file)
--- 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 8a9eadeeb1e142f1fdaf062a6c037cf1b3de2b39..5e86ed2136b93ae337cd0b13070b6581bc55d062 100644 (file)
--- 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 6945d229525ac78408488b46a1fb4d797a2aa4a6..789671ee334131557f0ce62aaf8e50f5b9452529 100644 (file)
--- 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 6d10daff1f3af1ce4a01d099773c9e0ec7c49aad..d929a664c4b194c5804170f0ff6f8858f8d6ab03 100644 (file)
--- 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 14b16a89ed5b5d6e8ae4c20a7663731c46d9ce90..08f0269d5f9561905406ac0731a9d77e885e9619 100644 (file)
--- 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 ed057052f973eafa0dbdd4e53f9ca897e25a3aa9..a82d48819a1851d695f3eb0a05a84df2f4e31b1b 100644 (file)
--- 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 f4b36978eb005326d498370a1566cc07f926b597..bff3a9846f8508161f52c69b94b460b86eb03788 100644 (file)
--- 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 e38b07ae033d3c0548c402b7bea239fdda3318f6..c33a9b0506023ad10596bfc767e6334c27ee642b 100644 (file)
--- 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 7fc1f740de5cedbda9ddaaa99aeb080cefd9e682..4abf4ee46475a56b355c897d1769163cc3f71b44 100644 (file)
--- 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 33f7b546380e27b206da03000f1c0a892c986610..0fdcb9c587be2a2771f24f313e26e19dd0e6a16e 100644 (file)
--- 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 3a274190d8b8ac39543d90cfc750979696a385c6..55dd103973ee5825e52ab7353cb28babfd8f05da 100755 (executable)
--- 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 c31de85f5b4b95ed983f4a67dd47d60053fc7cb2..c3e90c3cd3f6e532719ce0ec52d6d78247cde587 100644 (file)
--- 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 a1e46356bc267fa8bd2696f415772375e92fe330..bfac98942786bca9329225d2009409d7ecc1184d 100644 (file)
--- 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 eebbfe58c9cb943d6ee4acfce77ac86e3485b4a7..64ddbd2071a55024293d76128f3a9e704233a1c0 100644 (file)
--- 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 357a6e6fbeccc02a8c16d79355e9b1c591823dda..4d98bd450a529402e5b8991433bf4f2dbca5d29b 100644 (file)
--- 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 cf6ea9a0ab6eba059f6b815402fdcd5bd158dc76..3b23bbf1aea954537a717ca7b89c3d3c3d7c6f52 100644 (file)
--- 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 ed750dc49902d1436e669bd7dfba08b37d255a82..4ed7f4ff1c340b45cd2f8955b4c673f09fb80487 100644 (file)
--- 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 7d114f87e1f0ab8ff5ee25e55618b5b40afc3042..84a1f5ed181e794befea8685ba7acf123a143fc8 100644 (file)
--- 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 81a810814e05f96930ddd85391a5599ba5ce4d0c..550864c2b7daaff1efcac21c9c1c8178440e8c02 100644 (file)
--- 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 0b9f4d4557d713ab9d46b1711c0c9e584f84e60f..805082cab2423aa6a9a8962d3470282e9357c030 100644 (file)
--- 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 6f8689db906abfe33488edf425cead9d0c4e0640..df510fc9994eb61f4376a698205ec3562e8bc017 100644 (file)
--- 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 8694eae4963371bf65782c0ddb478fc9afd94523..408a310aa844282cafb026e65aea0e2b72de7099 100644 (file)
--- 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 accf402b576b89889b904ccd8528c12eab8ab716..8cf859bb31ce52db41d3606c8a7c7cbfff158ddf 100644 (file)
--- 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 3b99f45495c41532c4a9eaa4f751b72117d0758a..ce2c1824795e78769636762ea3d983270aba0d83 100644 (file)
--- 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 75fa4a6a3f7e7d52e7c10e4e063bccbfd672b666..5a8ecae80a80249304d50819739d89f39c2ce209 100644 (file)
--- 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: ''