diff --git a/.zuul.yaml b/.zuul.yaml index b0f92a6..5d923e6 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -7,11 +7,13 @@ - watcher-tempest-functional - watcher-tempest-dummy_optim - watcher-tempest-actuator - - watcher-tempest-basic_optim + - watcher-tempest-basic_optim: + voting: false - watcher-tempest-vm_workload_consolidation - watcher-tempest-host_maintenance - watcher-tempest-storage_balance - - watcher-tempest-workload_balancing + - watcher-tempest-workload_balancing: + voting: false - watcher-tempest-zone_migration gate: diff --git a/watcher_tempest_plugin/tests/scenario/test_execute_basic_optim.py b/watcher_tempest_plugin/tests/scenario/test_execute_basic_optim.py index 8d88502..634a6b6 100644 --- a/watcher_tempest_plugin/tests/scenario/test_execute_basic_optim.py +++ b/watcher_tempest_plugin/tests/scenario/test_execute_basic_optim.py @@ -86,7 +86,8 @@ class TestExecuteBasicStrategy(base.BaseInfraOptimScenarioTest): parameters={ "granularity": 300, "period": 72000, - "aggregation_method": {"instance": "mean", "node": "mean"} + "aggregation_method": {"instance": "mean", + "compute_node": "mean"} } ) diff --git a/watcher_tempest_plugin/tests/scenario/test_execute_dummy_optim.py b/watcher_tempest_plugin/tests/scenario/test_execute_dummy_optim.py index 724bbd1..330123d 100644 --- a/watcher_tempest_plugin/tests/scenario/test_execute_dummy_optim.py +++ b/watcher_tempest_plugin/tests/scenario/test_execute_dummy_optim.py @@ -51,8 +51,8 @@ class TestExecuteDummyStrategy(base.BaseInfraOptimScenarioTest): self.assertTrue(test_utils.call_until_true( func=functools.partial(self.has_audit_finished, audit['uuid']), - duration=30, - sleep_for=.5 + duration=60, + sleep_for=2 )) self.assertTrue(self.has_audit_succeeded(audit['uuid'])) @@ -74,8 +74,8 @@ class TestExecuteDummyStrategy(base.BaseInfraOptimScenarioTest): self.assertTrue(test_utils.call_until_true( func=functools.partial( self.has_action_plan_finished, action_plan['uuid']), - duration=30, - sleep_for=.5 + duration=60, + sleep_for=2 )) _, finished_ap = self.client.show_action_plan(action_plan['uuid']) _, action_list = self.client.list_actions( diff --git a/watcher_tempest_plugin/tests/scenario/test_execute_workload_balancing.py b/watcher_tempest_plugin/tests/scenario/test_execute_workload_balancing.py index 2b5ed95..7657dd2 100644 --- a/watcher_tempest_plugin/tests/scenario/test_execute_workload_balancing.py +++ b/watcher_tempest_plugin/tests/scenario/test_execute_workload_balancing.py @@ -66,13 +66,13 @@ class TestExecuteWorkloadBalancingStrategy(base.BaseInfraOptimScenarioTest): self.make_host_statistic() audit_parameters = { - "metrics": ["cpu_util"], - "thresholds": {"cpu_util": 0.2}, - "weights": {"cpu_util_weight": 1.0}, - "periods": {"instance": 72000, "node": 60000}, - "instance_metrics": {"cpu_util": "compute.node.cpu.percent"}, + "metrics": ["instance_cpu_usage"], + "thresholds": {"instance_cpu_usage": 0.2}, + "weights": {"instance_cpu_usage_weight": 1.0}, + "periods": {"instance": 72000, "compute_node": 60000}, + "instance_metrics": {"instance_cpu_usage": "host_cpu_usage"}, "granularity": 300, - "aggregation_method": {"instance": "mean", "node": "mean"}} + "aggregation_method": {"instance": "mean", "compute_node": "mean"}} _, goal = self.client.show_goal(self.GOAL) _, strategy = self.client.show_strategy("workload_stabilization")