Do not execute ha tests on non-ha environments

Change-Id: I58d164bd10993c2f1e4fd5149bda7c39c3661ffb
This commit is contained in:
Victor Ryzhenkin 2016-08-26 03:13:58 +03:00
parent 1d1f4dd1fd
commit a6b4b9ed37
5 changed files with 18 additions and 19 deletions

View File

@ -77,9 +77,8 @@ class MuranoPluginApi(object):
"""Upload and install the plugin on the Fuel master node."""
self.helpers.prepare_plugin(self.settings.plugin_path)
def run_ostf(self):
self.helpers.run_ostf(test_sets=['sanity', 'smoke', 'ha',
'tests_platform'])
def run_ostf(self, test_sets):
self.helpers.run_ostf(test_sets=test_sets)
def activate_plugin(self, options=None):
"""Enable and configure the plugin in the environment."""

View File

@ -29,7 +29,7 @@ class TestMuranoFailover(api.MuranoPluginApi):
self.check_plugin_failover(operation, role_name)
self.run_ostf()
self.run_ostf(['sanity', 'smoke', 'tests_platform'])
@test(depends_on_groups=["deploy_murano_plugin"],
groups=["failover", "murano", "system", "destructive",

View File

@ -54,7 +54,7 @@ class TestMuranoPluginBvt(api.MuranoPluginApi):
self.helpers.deploy_cluster(self.base_nodes)
self.run_ostf()
self.run_ostf(['sanity', 'smoke', 'tests_platform'])
self.env.make_snapshot("deploy_murano_plugin", is_make=True)
@ -90,7 +90,7 @@ class TestMuranoPluginBvt(api.MuranoPluginApi):
self.helpers.deploy_cluster(self.ha_nodes)
self.run_ostf()
self.run_ostf(['sanity', 'smoke', 'ha', 'tests_platform'])
self.env.make_snapshot("deploy_murano_plugin_ha", is_make=True)
@ -126,13 +126,13 @@ class TestMuranoPluginBvt(api.MuranoPluginApi):
self.helpers.deploy_cluster(self.full_ha_nodes)
self.run_ostf()
self.run_ostf(['sanity', 'smoke', 'ha', 'tests_platform'])
self.env.make_snapshot("deploy_murano_plugin_full_ha", is_make=True)
@test(depends_on=[deploy_murano_plugin],
groups=["uninstall_deployed_murano_plugin", "uninstall",
"murano_plugin", "smoke"])
"murano_plugin", "smoke", 'murano'])
@log_snapshot_after_test
def uninstall_deployed_murano_plugin(self):
"""Uninstall the Murano plugin with a deployed environment
@ -155,7 +155,7 @@ class TestMuranoPluginBvt(api.MuranoPluginApi):
@test(depends_on_groups=["prepare_slaves_3"],
groups=["uninstall_murano_plugin", "uninstall", "murano_plugin",
"smoke"])
"smoke", 'murano'])
@log_snapshot_after_test
def uninstall_murano_plugin(self):
"""Uninstall the Murano plugin

View File

@ -27,7 +27,7 @@ class TestMuranoPostInstallation(api.MuranoPluginApi):
@test(depends_on_groups=["prepare_slaves_3"],
groups=["deploy_environment_without_murano_plugin", "deploy",
"murano_plugin", "post_installation"])
"murano_plugin", "post_installation", 'murano'])
@log_snapshot_after_test
def deploy_environment_without_murano_plugin(self):
"""Deploy a cluster without the Murano Detach plugin.
@ -60,14 +60,14 @@ class TestMuranoPostInstallation(api.MuranoPluginApi):
'slave-02': ['compute', 'cinder'],
})
self.helpers.run_ostf()
self.run_ostf(['sanity', 'smoke', 'tests_platform'])
self.env.make_snapshot("deploy_environment_without_murano_plugin",
is_make=True)
@test(depends_on=[deploy_environment_without_murano_plugin],
groups=["deploy_murano_plugin_in_existing_environment", "deploy",
"murano_plugin", "post_installation"])
"murano_plugin", "post_installation", 'murano'])
@log_snapshot_after_test
def deploy_murano_plugin_in_existing_environment(self):
"""Deploy the Murano Detach plugin in an existing environment.
@ -92,4 +92,4 @@ class TestMuranoPostInstallation(api.MuranoPluginApi):
self.check_plugin_online()
self.run_ostf()
self.run_ostf(['sanity', 'smoke', 'tests_platform'])

View File

@ -59,7 +59,7 @@ class TestSystemMuranoPlugin(api.MuranoPluginApi):
self.check_plugin_online()
self.run_ostf()
self.run_ostf(['sanity', 'smoke', 'ha', 'tests_platform'])
compute_manipulated_node = {'slave-04': ['compute', 'cinder']}
@ -68,7 +68,7 @@ class TestSystemMuranoPlugin(api.MuranoPluginApi):
self.check_plugin_online()
self.run_ostf()
self.run_ostf(['sanity', 'smoke', 'ha', 'tests_platform'])
# Add controller
# NOTE(rpromyshlennikov): test can fail here before
@ -78,14 +78,14 @@ class TestSystemMuranoPlugin(api.MuranoPluginApi):
self.check_plugin_online()
self.run_ostf()
self.run_ostf(['sanity', 'smoke', 'ha', 'tests_platform'])
# Add compute
self.helpers.add_nodes_to_cluster(compute_manipulated_node)
self.check_plugin_online()
self.run_ostf()
self.run_ostf(['sanity', 'smoke', 'ha', 'tests_platform'])
@test(depends_on_groups=["deploy_murano_plugin_full_ha"],
groups=["check_scaling_murano", "scaling",
@ -117,11 +117,11 @@ class TestSystemMuranoPlugin(api.MuranoPluginApi):
self.check_plugin_online()
self.run_ostf()
self.run_ostf(['sanity', 'smoke', 'ha', 'tests_platform'])
# Add Murano Detach node
self.helpers.add_nodes_to_cluster(manipulated_node)
self.check_plugin_online()
self.run_ostf()
self.run_ostf(['sanity', 'smoke', 'ha', 'tests_platform'])