Add custom groups for template base cases
For define own group, put it into group_list in define_custom_group() at run_tests.py Implements blueprint template-based-testcases Change-Id: I8804768f17dc2368b7c2f99dc838ec0308bba79a
This commit is contained in:
parent
12c2629b65
commit
68ed1d6793
|
@ -16,7 +16,6 @@ import logging
|
|||
import os
|
||||
from fuelweb_test.settings import LOGS_DIR
|
||||
|
||||
|
||||
if not os.path.exists(LOGS_DIR):
|
||||
os.makedirs(LOGS_DIR)
|
||||
|
||||
|
|
|
@ -18,6 +18,27 @@ import os
|
|||
import re
|
||||
from nose.plugins import Plugin
|
||||
from paramiko.transport import _join_lingering_threads
|
||||
from proboscis import register
|
||||
|
||||
|
||||
def define_custom_groups():
|
||||
# Should move to system_test.__init__.py after upgrade devops to 2.9.13
|
||||
groups_list = [
|
||||
{"groups": ["system_test.ceph_ha"],
|
||||
"depends": [
|
||||
"system_test.deploy_and_check_radosgw."
|
||||
"3ctrl_3comp_ceph_neutronVLAN"]},
|
||||
{"groups": ["system_test.strength"],
|
||||
"depends": [
|
||||
"system_test.failover.destroy_controllers."
|
||||
"first.3ctrl_2comp_1cndr_neutronVLAN",
|
||||
"system_test.failover.destroy_controllers."
|
||||
"second.1ctrl_ceph_2ctrl_1comp_1comp_ceph_neutronVLAN"]}
|
||||
]
|
||||
|
||||
for new_group in groups_list:
|
||||
register(groups=new_group['groups'],
|
||||
depends_on_groups=new_group['depends'])
|
||||
|
||||
|
||||
class CloseSSHConnectionsPlugin(Plugin):
|
||||
|
@ -121,6 +142,7 @@ def run_tests():
|
|||
|
||||
if __name__ == '__main__':
|
||||
import_tests()
|
||||
define_custom_groups()
|
||||
from fuelweb_test.helpers.patching import map_test
|
||||
if any(re.search(r'--group=patching_master_tests', arg)
|
||||
for arg in sys.argv):
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
|
||||
import fuelweb_test
|
||||
|
||||
logger = fuelweb_test.logger
|
||||
|
|
|
@ -42,7 +42,7 @@ class StrenghtDestroyFirstContorller(strength_base.StrenghtBaseActions):
|
|||
base_group = ['system_test',
|
||||
'system_test.failover',
|
||||
'system_test.failover.destroy_controllers',
|
||||
'system_test.failover.destroy_controllers.second']
|
||||
'system_test.failover.destroy_controllers.first']
|
||||
|
||||
actions_order = [
|
||||
'setup_master',
|
||||
|
@ -90,10 +90,10 @@ class StrenghtDestroySecondContorller(strength_base.StrenghtBaseActions):
|
|||
|
||||
"""
|
||||
|
||||
base_group = ['actions_tests',
|
||||
'actions_tests.failover',
|
||||
'actions_tests.failover.destroy_controllers',
|
||||
'actions_tests.failover.destroy_controllers.second']
|
||||
base_group = ['system_test',
|
||||
'system_test.failover',
|
||||
'system_test.failover.destroy_controllers',
|
||||
'system_test.failover.destroy_controllers.second']
|
||||
|
||||
actions_order = [
|
||||
'setup_master',
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
storages:
|
||||
!include storages/cephImgVol.yaml
|
||||
components:
|
||||
!include components/wo_components.yaml
|
|
@ -0,0 +1,14 @@
|
|||
---
|
||||
template:
|
||||
name: 1 Controller + Ceph, 2 Controller, 1 Compute, 1 Compute + Ceph on Neutron/VLAN
|
||||
group-name: 1ctrl_ceph_2ctrl_1comp_1comp_ceph_neutronVLAN
|
||||
slaves: 5
|
||||
cluster-template:
|
||||
name: HAwithCinderNeutronVLAN
|
||||
release: ubuntu
|
||||
network:
|
||||
!include ../../../cluster_configs/networks/neutron_vlan.yaml
|
||||
settings:
|
||||
!include ../../../cluster_configs/settings/cephVolImg_wo_components.yaml
|
||||
nodes:
|
||||
!include ../../../cluster_configs/nodes/single/3ctrl_2comp_1cndr.yaml
|
|
@ -7,8 +7,8 @@ template:
|
|||
name: HAwithCinderNeutronVLAN
|
||||
release: ubuntu
|
||||
network:
|
||||
!include ../../cluster_configs/networks/neutron_vlan.yaml
|
||||
!include ../../../cluster_configs/networks/neutron_vlan.yaml
|
||||
settings:
|
||||
!include ../../cluster_configs/settings/cinder_wo_componets.yaml
|
||||
!include ../../../cluster_configs/settings/cinder_wo_componets.yaml
|
||||
nodes:
|
||||
!include ../../cluster_configs/nodes/single/3ctrl_2comp_1cndr.yaml
|
||||
!include ../../../cluster_configs/nodes/single/3ctrl_2comp_1cndr.yaml
|
Loading…
Reference in New Issue