add support for JVM monitoring

- delete
   .../test/csit/scripts/set_elasticsearch_attribute_short.sh (or ...long.sh)
   .../test/csit/scripts/set_jvm_common_attribute.sh
   in scriptplans files (in the folder integration/test/csit/scriptplans)
- delete
  integration/test/csit/suites/integration/Create_JVM_Plots.robot
  in testplans    (in the folder integration/test/csit/testplans)

These explicit mentions are moved to the scripts in releng/builder repo
see related  gerrit patch 85398

JIRA: INTTEST-14
Signed-off-by: Stanislav Chlebec <stanislav.chlebec@pantheon.tech>
Change-Id: I4b6133ee8c2e4c595ee42859a888edf2fc73deea

diff --git a/csit/scriptplans/netconf-scale-max-devices.txt b/csit/scriptplans/netconf-scale-max-devices.txt
deleted file mode 100644 (file)
index 1a31c3a..0000000
--- a/csit/scriptplans/netconf-scale-max-devices.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place the scripts in run order:
-integration/test/csit/scripts/set_elasticsearch_attribute_short.sh
-integration/test/csit/scripts/set_jvm_common_attribute.sh

diff --git a/csit/scriptplans/netvirt.txt b/csit/scriptplans/netvirt.txt
index 00de6c8d396f5ab6c36abf3b170d30698c4073af..c15aa1233045f3234dd4d9a98679facf20ef5dff 100644 (file)
--- a/csit/scriptplans/netvirt.txt
+++ b/csit/scriptplans/netvirt.txt
@@ -1,4 +1,2 @@
 # Place the scripts in run order:
 integration/test/csit/scripts/set_single_shard.sh
-integration/test/csit/scripts/set_elasticsearch_attribute_short.sh
-integration/test/csit/scripts/set_jvm_common_attribute.sh
\ No newline at end of file

diff --git a/csit/scriptplans/openflowplugin-clustering-perf-bulkomatic.txt b/csit/scriptplans/openflowplugin-clustering-perf-bulkomatic.txt
index f325c814ef5cda7bd669f022a5fe9117d786ae5d..4672a4e9f4a650974d8d74cf261abcc57718c729 100644 (file)
--- a/csit/scriptplans/openflowplugin-clustering-perf-bulkomatic.txt
+++ b/csit/scriptplans/openflowplugin-clustering-perf-bulkomatic.txt
@@ -1,4 +1,2 @@
 # Place the scripts in run order:
 integration/test/csit/scripts/controllermem_6g.sh
-integration/test/csit/scripts/set_elasticsearch_attribute_short.sh
-integration/test/csit/scripts/set_jvm_common_attribute.sh

diff --git a/csit/scriptplans/openflowplugin-longevity.txt b/csit/scriptplans/openflowplugin-longevity.txt
deleted file mode 100644 (file)
index 36bae08..0000000
--- a/csit/scriptplans/openflowplugin-longevity.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place the scripts in run order:
-integration/test/csit/scripts/set_elasticsearch_attribute_long.sh
-integration/test/csit/scripts/set_jvm_common_attribute.sh

diff --git a/csit/scriptplans/openflowplugin-perf-bulkomatic.txt b/csit/scriptplans/openflowplugin-perf-bulkomatic.txt
deleted file mode 100644 (file)
index 1a31c3a..0000000
--- a/csit/scriptplans/openflowplugin-perf-bulkomatic.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place the scripts in run order:
-integration/test/csit/scripts/set_elasticsearch_attribute_short.sh
-integration/test/csit/scripts/set_jvm_common_attribute.sh

diff --git a/csit/scriptplans/openflowplugin-scale-link.txt b/csit/scriptplans/openflowplugin-scale-link.txt
deleted file mode 100644 (file)
index 1a31c3a..0000000
--- a/csit/scriptplans/openflowplugin-scale-link.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place the scripts in run order:
-integration/test/csit/scripts/set_elasticsearch_attribute_short.sh
-integration/test/csit/scripts/set_jvm_common_attribute.sh

diff --git a/csit/scriptplans/openflowplugin-scale-switch.txt b/csit/scriptplans/openflowplugin-scale-switch.txt
deleted file mode 100644 (file)
index 1a31c3a..0000000
--- a/csit/scriptplans/openflowplugin-scale-switch.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place the scripts in run order:
-integration/test/csit/scripts/set_elasticsearch_attribute_short.sh
-integration/test/csit/scripts/set_jvm_common_attribute.sh

diff --git a/csit/scriptplans/openflowplugin-scale.txt b/csit/scriptplans/openflowplugin-scale.txt
deleted file mode 100644 (file)
index 1a31c3a..0000000
--- a/csit/scriptplans/openflowplugin-scale.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place the scripts in run order:
-integration/test/csit/scripts/set_elasticsearch_attribute_short.sh
-integration/test/csit/scripts/set_jvm_common_attribute.sh

diff --git a/csit/scriptplans/ovsdb.txt b/csit/scriptplans/ovsdb.txt
deleted file mode 100644 (file)
index 1a31c3a..0000000
--- a/csit/scriptplans/ovsdb.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place the scripts in run order:
-integration/test/csit/scripts/set_elasticsearch_attribute_short.sh
-integration/test/csit/scripts/set_jvm_common_attribute.sh

diff --git a/csit/testplans/netconf-scale-max-devices.txt b/csit/testplans/netconf-scale-max-devices.txt
index 4ed16f9ecf159e4968aacb5da666177fc6e43970..667aa507b5f90feaad147537282189b19f1f1022 100644 (file)
--- a/csit/testplans/netconf-scale-max-devices.txt
+++ b/csit/testplans/netconf-scale-max-devices.txt
@@ -7,4 +7,3 @@
 # Place the suites in run order:
 integration/test/csit/suites/netconf/ready
 integration/test/csit/suites/netconf/scale/max_devices.robot
-integration/test/csit/suites/integration/Create_JVM_Plots.robot

diff --git a/csit/testplans/netvirt-1node-dcgw-openstack.txt b/csit/testplans/netvirt-1node-dcgw-openstack.txt
index 54b7838ae773ef5d84ecd7738c483d1f4ee6cd12..3c5195e7047ff342b8d91c92d321c56cd68a7e8d 100644 (file)
--- a/csit/testplans/netvirt-1node-dcgw-openstack.txt
+++ b/csit/testplans/netvirt-1node-dcgw-openstack.txt
@@ -3,4 +3,3 @@ integration/test/csit/suites/netvirt/snatdnat/snat_dnat.robot
 integration/test/csit/suites/netvirt/subnet_routing/subnet_routing_and_multicast.robot
 integration/test/csit/suites/netvirt/l3vpn_bgp/bfd_bgp.robot
 integration/test/csit/suites/netvirt/l3vpn_bgp/l3vpn_bgp_multipath_maxpath_cli.robot
-integration/test/csit/suites/integration/Create_JVM_Plots.robot

diff --git a/csit/testplans/netvirt-1node-l2gw-openstack.txt b/csit/testplans/netvirt-1node-l2gw-openstack.txt
index a7a154b00eb82bbd01ba2ef554fdbe45d4cb2675..bd04a80f89f2c69d39f2620c4f8483730c02b3c1 100644 (file)
--- a/csit/testplans/netvirt-1node-l2gw-openstack.txt
+++ b/csit/testplans/netvirt-1node-l2gw-openstack.txt
@@ -1,2 +1 @@
 integration/test/csit/suites/l2gw/
-integration/test/csit/suites/integration/Create_JVM_Plots.robot

diff --git a/csit/testplans/netvirt-1node-minimal-openstack.txt b/csit/testplans/netvirt-1node-minimal-openstack.txt
index ef95eabc01f109144a8f643859a80e1e164adc84..1440edf3c7dc162f2a395ed5b4fabc33df6b2f77 100644 (file)
--- a/csit/testplans/netvirt-1node-minimal-openstack.txt
+++ b/csit/testplans/netvirt-1node-minimal-openstack.txt
@@ -1,2 +1 @@
 integration/test/csit/suites/openstack/connectivity/
-integration/test/csit/suites/integration/Create_JVM_Plots.robot

diff --git a/csit/testplans/netvirt-1node-openstack-tempest.txt b/csit/testplans/netvirt-1node-openstack-tempest.txt
index 9a0ed00c5081da686311d85eab1a024513d38325..c9271980bf1e3829e2a62dc8a43dc30fdb349a62 100644 (file)
--- a/csit/testplans/netvirt-1node-openstack-tempest.txt
+++ b/csit/testplans/netvirt-1node-openstack-tempest.txt
@@ -1,2 +1 @@
 integration/test/csit/suites/openstack/tempest/tempest.robot
-integration/test/csit/suites/integration/Create_JVM_Plots.robot

diff --git a/csit/testplans/netvirt-1node-openstack-upgrade.txt b/csit/testplans/netvirt-1node-openstack-upgrade.txt
index 2619e1c83f114927b921b23952bf992872ef60bd..24a8584f13416fc1b825dd1854fe90f795a781b6 100644 (file)
--- a/csit/testplans/netvirt-1node-openstack-upgrade.txt
+++ b/csit/testplans/netvirt-1node-openstack-upgrade.txt
@@ -1,2 +1 @@
 integration/test/csit/suites/netvirt/upgrade/upgrade.robot
-integration/test/csit/suites/integration/Create_JVM_Plots.robot

diff --git a/csit/testplans/netvirt-1node-openstack.txt b/csit/testplans/netvirt-1node-openstack.txt
index 2cc937078bb9995ef24980af847477d5e9bb732b..4a4dd59991603809d4ca39b27a5f085386589091 100644 (file)
--- a/csit/testplans/netvirt-1node-openstack.txt
+++ b/csit/testplans/netvirt-1node-openstack.txt
@@ -16,4 +16,3 @@ integration/test/csit/suites/netvirt/l2l3_gatewaymac_arp.robot
 integration/test/csit/suites/netvirt/vnibasedl2switching/vnibasedl2switching.robot
 integration/test/csit/suites/netvirt/vnibasedl3forwarding/vnibasedl3forwarding.robot
 integration/test/csit/suites/netvirt/vnibasedIpv6forwarding/vnibasedIpv6forwarding.robot
-integration/test/csit/suites/integration/Create_JVM_Plots.robot

diff --git a/csit/testplans/netvirt-1node-tdd-wip-openstack.txt b/csit/testplans/netvirt-1node-tdd-wip-openstack.txt
index 193594b0b05c4d338a771624e981ada94f45e14a..8699a475f7b3cea1604a49a5c7de0e2dc43b2ea3 100644 (file)
--- a/csit/testplans/netvirt-1node-tdd-wip-openstack.txt
+++ b/csit/testplans/netvirt-1node-tdd-wip-openstack.txt
@@ -7,4 +7,3 @@ integration/test/csit/suites/netvirt/host_route/host_route_handling.robot
 integration/test/csit/suites/netvirt/l3vpn_bgp/multi_vpn_bgp.robot
 integration/test/csit/suites/netvirt/bgpvpn/bgpvpn.robot
 integration/test/csit/suites/netvirt/ofpunt_path/openflow_punt_path_protection.robot
-integration/test/csit/suites/integration/Create_JVM_Plots.robot

diff --git a/csit/testplans/netvirt-3node-dcgw-openstack.txt b/csit/testplans/netvirt-3node-dcgw-openstack.txt
index 28bb095d0cfd733a4fc92253110041c9c93d8933..9697f27cbbab2a473494a1a68936a89d1ed13c72 100644 (file)
--- a/csit/testplans/netvirt-3node-dcgw-openstack.txt
+++ b/csit/testplans/netvirt-3node-dcgw-openstack.txt
@@ -2,4 +2,3 @@
 integration/test/csit/suites/netvirt/snatdnat/snat_dnat.robot
 integration/test/csit/suites/netvirt/subnet_routing/subnet_routing_and_multicast.robot
 integration/test/csit/suites/netvirt/l3vpn_bgp/l3vpn_bgp_multipath_maxpath_cli.robot
-integration/test/csit/suites/integration/Create_JVM_Plots.robot

diff --git a/csit/testplans/netvirt-3node-l2gw-openstack.txt b/csit/testplans/netvirt-3node-l2gw-openstack.txt
index a7a154b00eb82bbd01ba2ef554fdbe45d4cb2675..bd04a80f89f2c69d39f2620c4f8483730c02b3c1 100644 (file)
--- a/csit/testplans/netvirt-3node-l2gw-openstack.txt
+++ b/csit/testplans/netvirt-3node-l2gw-openstack.txt
@@ -1,2 +1 @@
 integration/test/csit/suites/l2gw/
-integration/test/csit/suites/integration/Create_JVM_Plots.robot

diff --git a/csit/testplans/netvirt-3node-minimal-openstack.txt b/csit/testplans/netvirt-3node-minimal-openstack.txt
index 7be74d78b612dd29aaec9ff102482dfd252c823d..60de2502395ec9bb93268f63a3ec3d59c54c75ec 100644 (file)
--- a/csit/testplans/netvirt-3node-minimal-openstack.txt
+++ b/csit/testplans/netvirt-3node-minimal-openstack.txt
@@ -1,2 +1 @@
 integration/test/csit/suites/openstack/clustering/
-integration/test/csit/suites/integration/Create_JVM_Plots.robot

diff --git a/csit/testplans/netvirt-3node-openstack.txt b/csit/testplans/netvirt-3node-openstack.txt
index ba62b36eb293a2da79e4e13f06f57e6878bc2d7f..1eb224d0be09a4f0b267c8520050e7669dfcaf34 100644 (file)
--- a/csit/testplans/netvirt-3node-openstack.txt
+++ b/csit/testplans/netvirt-3node-openstack.txt
@@ -9,4 +9,3 @@ integration/test/csit/suites/openstack/clustering/ha_l3.robot
 # integration/test/csit/suites/openstack/clustering/ha_l3_block_port.robot
 integration/test/csit/suites/netvirt/vpnservice/vpn_basic.robot
 integration/test/csit/suites/netvirt/elan/elan.robot
-integration/test/csit/suites/integration/Create_JVM_Plots.robot

diff --git a/csit/testplans/netvirt-3node-tdd-wip-openstack.txt b/csit/testplans/netvirt-3node-tdd-wip-openstack.txt
index 5f600695162ca4e959954e1c441b6cdbeaf6d168..aac7c0f2b686f9fcd48f5759df9a957a4767970e 100644 (file)
--- a/csit/testplans/netvirt-3node-tdd-wip-openstack.txt
+++ b/csit/testplans/netvirt-3node-tdd-wip-openstack.txt
@@ -3,4 +3,3 @@
 # unnecessary failures.
 integration/test/csit/suites/netvirt/vpnservice/vpn_basic_dualstack_one_router.robot
 integration/test/csit/suites/netvirt/host_route/host_route_handling.robot
-integration/test/csit/suites/integration/Create_JVM_Plots.robot

diff --git a/csit/testplans/netvirt-extensions-sfc.txt b/csit/testplans/netvirt-extensions-sfc.txt
index 2fe75c5687e7f9fef289ecb84c3b5a3f30a7afae..e34806bae7188207dd826e7cc23079d04c6654e5 100644 (file)
--- a/csit/testplans/netvirt-extensions-sfc.txt
+++ b/csit/testplans/netvirt-extensions-sfc.txt
@@ -1,2 +1 @@
 integration/test/csit/suites/openstack/extensions/sfc.robot
-integration/test/csit/suites/integration/Create_JVM_Plots.robot
\ No newline at end of file

diff --git a/csit/testplans/openflowplugin-clustering-perf-bulkomatic.txt b/csit/testplans/openflowplugin-clustering-perf-bulkomatic.txt
index 9cb4303420a3a3f8e68da4bc910d04388d707106..1413796900003feea74ef7466da623a3f5b73edc 100644 (file)
--- a/csit/testplans/openflowplugin-clustering-perf-bulkomatic.txt
+++ b/csit/testplans/openflowplugin-clustering-perf-bulkomatic.txt
@@ -1,3 +1,2 @@
 # Place the suites in run order:
 integration/test/csit/suites/openflowplugin/Performance_Bulkomatic/100K_Flows_100DPN_3Node_Cluster_Perf_Test.robot
-integration/test/csit/suites/integration/Create_JVM_Plots.robot

diff --git a/csit/testplans/openflowplugin-longevity.txt b/csit/testplans/openflowplugin-longevity.txt
index 5694d625f289870f27fe5c77b2adfda786971e55..ff5475e2f855debbd47af677537b423f08c2303d 100644 (file)
--- a/csit/testplans/openflowplugin-longevity.txt
+++ b/csit/testplans/openflowplugin-longevity.txt
@@ -1,3 +1,2 @@
 # Place the suites in run order:
 integration/test/csit/suites/openflowplugin/Longevity/010__longevity_test.robot
-integration/test/csit/suites/integration/Create_JVM_Plots.robot

diff --git a/csit/testplans/openflowplugin-perf-bulkomatic.txt b/csit/testplans/openflowplugin-perf-bulkomatic.txt
index 8cc8e7524a180ccea547dc7b5c15140122721d12..0205fefe887310f2cc9b8d24b5ab400d0b0beb3c 100644 (file)
--- a/csit/testplans/openflowplugin-perf-bulkomatic.txt
+++ b/csit/testplans/openflowplugin-perf-bulkomatic.txt
@@ -1,3 +1,2 @@
 # Place the suites in run order:
 integration/test/csit/suites/openflowplugin/Performance_Bulkomatic/100K_Flows_100DPN_1Node_Perf_Test.robot
-integration/test/csit/suites/integration/Create_JVM_Plots.robot

diff --git a/csit/testplans/openflowplugin-scale-link.txt b/csit/testplans/openflowplugin-scale-link.txt
index 8e47218adf476cc6c739c0a7a00ba8849eb83f29..abb02cc592fcd7f1432d7b8b6c7423402777b53b 100644 (file)
--- a/csit/testplans/openflowplugin-scale-link.txt
+++ b/csit/testplans/openflowplugin-scale-link.txt
@@ -1,3 +1,2 @@
 # Place the suites in run order:
 integration/test/csit/suites/openflowplugin/Maximum_Links
-integration/test/csit/suites/integration/Create_JVM_Plots.robot

diff --git a/csit/testplans/openflowplugin-scale-switch.txt b/csit/testplans/openflowplugin-scale-switch.txt
index daedcbf95d1e21d34c9b302350f7798f8c920d26..1f7689ff179ba23106ee33d5933d144b3fd1a505 100644 (file)
--- a/csit/testplans/openflowplugin-scale-switch.txt
+++ b/csit/testplans/openflowplugin-scale-switch.txt
@@ -1,3 +1,2 @@
 # Place the suites in run order:
 integration/test/csit/suites/openflowplugin/Maximum_Switches/010__finding_max_switches.robot
-integration/test/csit/suites/integration/Create_JVM_Plots.robot

diff --git a/csit/testplans/openflowplugin-scale.txt b/csit/testplans/openflowplugin-scale.txt
index 876b99fb64d1ecbfb5f6fb7f24db0fe5e479899a..9bd50a162a1bc9c7dd2d1e8386365e9c40e26e25 100644 (file)
--- a/csit/testplans/openflowplugin-scale.txt
+++ b/csit/testplans/openflowplugin-scale.txt
@@ -1,3 +1,2 @@
 # Place the suites in run order:
 integration/test/csit/suites/openflowplugin/Inventory_Scalability_OF13
-integration/test/csit/suites/integration/Create_JVM_Plots.robot

diff --git a/csit/testplans/ovsdb-upstream-clustering.txt b/csit/testplans/ovsdb-upstream-clustering.txt
index 4242b48091f1638b8530a26e26d1290b22b813f8..22afaefbe92d6ffd11188d806261399793fa8251 100644 (file)
--- a/csit/testplans/ovsdb-upstream-clustering.txt
+++ b/csit/testplans/ovsdb-upstream-clustering.txt
@@ -1,4 +1,3 @@
 # Place the suites in run order:
 integration/test/csit/suites/ovsdb/Southbound_Cluster
 integration/test/csit/suites/ovsdb/Southbound_Cluster
-integration/test/csit/suites/integration/Create_JVM_Plots.robot