Re-group tests related to cluster upgrade extension
Partial-Bug: #1613987 Change-Id: I1c8a173063622156443311f2a22b287f1081e38f
This commit is contained in:
parent
74bc13f2cd
commit
cad3ace2e6
|
@ -66,11 +66,6 @@ Test Cli deploy ceph neutron tun
|
|||
.. automodule:: fuelweb_test.tests.tests_cli.test_cli_deploy_ceph
|
||||
:members:
|
||||
|
||||
Test Clone Environment
|
||||
----------------------
|
||||
.. automodule:: fuelweb_test.tests.test_clone_env
|
||||
:members:
|
||||
|
||||
Test custom hostname
|
||||
--------------------
|
||||
.. automodule:: fuelweb_test.tests.test_custom_hostname
|
||||
|
@ -272,11 +267,6 @@ Test Node reinstallation
|
|||
.. automodule:: fuelweb_test.tests.test_node_reinstallation
|
||||
:members:
|
||||
|
||||
Test Node reassignment
|
||||
----------------------
|
||||
.. automodule:: fuelweb_test.tests.test_node_reassignment
|
||||
:members:
|
||||
|
||||
Test offloading types
|
||||
---------------------
|
||||
.. automodule:: fuelweb_test.tests.test_offloading_types
|
||||
|
@ -657,11 +647,13 @@ Upgrade tests
|
|||
|
||||
Test Data-Driven Upgrade
|
||||
------------------------
|
||||
.. automodule:: fuelweb_test.tests.tests_upgrade.test_clone_env
|
||||
.. automodule:: fuelweb_test.tests.tests_upgrade.test_data_driven_upgrade_base
|
||||
.. automodule:: fuelweb_test.tests.tests_upgrade.test_data_driven_upgrade
|
||||
.. automodule:: fuelweb_test.tests.tests_upgrade.test_data_driven_upgrade_ceph_ha
|
||||
.. automodule:: fuelweb_test.tests.tests_upgrade.test_data_driven_upgrade_net_tmpl
|
||||
.. automodule:: fuelweb_test.tests.tests_upgrade.test_data_driven_upgrade_plugin
|
||||
.. automodule:: fuelweb_test.tests.tests_upgrade.test_node_reassignment
|
||||
.. automodule:: fuelweb_test.tests.tests_upgrade.upgrader_tool
|
||||
:members:
|
||||
|
||||
|
|
|
@ -14,18 +14,22 @@
|
|||
|
||||
# pylint: disable=line-too-long
|
||||
|
||||
from fuelweb_test.tests.tests_upgrade import test_clone_env # noqa
|
||||
from fuelweb_test.tests.tests_upgrade import test_data_driven_upgrade # noqa
|
||||
from fuelweb_test.tests.tests_upgrade import test_data_driven_upgrade_ceph_ha # noqa
|
||||
from fuelweb_test.tests.tests_upgrade import test_data_driven_upgrade_net_tmpl # noqa
|
||||
from fuelweb_test.tests.tests_upgrade import test_data_driven_upgrade_plugin # noqa
|
||||
from fuelweb_test.tests.tests_upgrade import test_node_reassignment # noqa
|
||||
from fuelweb_test.tests.tests_upgrade import upgrader_tool # noqa
|
||||
from fuelweb_test.tests.tests_upgrade import test_os_upgrade # noqa
|
||||
|
||||
__all__ = [
|
||||
'test_clone_env',
|
||||
'test_data_driven_upgrade',
|
||||
'test_data_driven_upgrade_ceph_ha',
|
||||
'test_data_driven_upgrade_net_tmpl',
|
||||
'test_data_driven_upgrade_plugin',
|
||||
'upgrader_tool',
|
||||
'test_os_upgrade'
|
||||
'test_node_reassignment',
|
||||
'test_os_upgrade',
|
||||
'upgrader_tool'
|
||||
]
|
||||
|
|
|
@ -24,7 +24,7 @@ from fuelweb_test.tests.base_test_case import TestBasic
|
|||
from fuelweb_test import logger
|
||||
|
||||
|
||||
@test(groups=["clone_env_for_os_upgrade", "upgrade_ceph_ha_tests"],
|
||||
@test(groups=["clone_env_for_os_upgrade", "cluster_upgrade_extension"],
|
||||
depends_on_groups=["upgrade_ceph_ha_restore"])
|
||||
class TestCloneEnv(TestBasic):
|
||||
|
|
@ -25,7 +25,7 @@ from fuelweb_test.tests.base_test_case import TestBasic
|
|||
|
||||
|
||||
@test(groups=["reassign_node_for_os_upgrade", "os_upgrade",
|
||||
"upgrade_ceph_ha_tests"],
|
||||
"cluster_upgrade_extension"],
|
||||
depends_on_groups=["upgrade_ceph_ha_restore"])
|
||||
class TestReassignNode(TestBasic):
|
||||
|
Loading…
Reference in New Issue