Change OSTF platfrom tests path in service tests
Related fix was merged in ostf that include renaming from platform_tests to tests_platform https://review.openstack.org/#/c/191737/ this patch includes updated in service tests for ostf test execution Change-Id: I766e1cd4558b080b22e841cb0a89b79eec02c977 Related-Bug: #1465238
This commit is contained in:
parent
a26678650c
commit
2731227429
@ -120,12 +120,12 @@ class SaharaHAOneController(TestBasic):
|
|||||||
settings.SERVTEST_SAHARA_VANILLA_2_IMAGE_NAME,
|
settings.SERVTEST_SAHARA_VANILLA_2_IMAGE_NAME,
|
||||||
settings.SERVTEST_SAHARA_VANILLA_2_IMAGE_META)
|
settings.SERVTEST_SAHARA_VANILLA_2_IMAGE_META)
|
||||||
|
|
||||||
path_to_tests = 'fuel_health.tests.platform_tests.test_sahara.'
|
path_to_tests = 'fuel_health.tests.tests_platform.test_sahara.'
|
||||||
test_names = ['VanillaTwoClusterTest.test_vanilla_two_cluster']
|
test_names = ['VanillaTwoClusterTest.test_vanilla_two_cluster']
|
||||||
for test_name in test_names:
|
for test_name in test_names:
|
||||||
LOGGER.debug('Run platform test {0} for Sahara'.format(test_name))
|
LOGGER.debug('Run platform test {0} for Sahara'.format(test_name))
|
||||||
self.fuel_web.run_single_ostf_test(
|
self.fuel_web.run_single_ostf_test(
|
||||||
cluster_id=cluster_id, test_sets=['platform_tests'],
|
cluster_id=cluster_id, test_sets=['tests_platform'],
|
||||||
test_name=path_to_tests + test_name, timeout=60 * 200)
|
test_name=path_to_tests + test_name, timeout=60 * 200)
|
||||||
|
|
||||||
self.env.make_snapshot("deploy_sahara_ha_one_controller_gre")
|
self.env.make_snapshot("deploy_sahara_ha_one_controller_gre")
|
||||||
@ -225,12 +225,12 @@ class SaharaHA(TestBasic):
|
|||||||
settings.SERVTEST_SAHARA_VANILLA_2_IMAGE_NAME,
|
settings.SERVTEST_SAHARA_VANILLA_2_IMAGE_NAME,
|
||||||
settings.SERVTEST_SAHARA_VANILLA_2_IMAGE_META)
|
settings.SERVTEST_SAHARA_VANILLA_2_IMAGE_META)
|
||||||
|
|
||||||
path_to_tests = 'fuel_health.tests.platform_tests.test_sahara.'
|
path_to_tests = 'fuel_health.tests.tests_platform.test_sahara.'
|
||||||
test_names = ['VanillaTwoClusterTest.test_vanilla_two_cluster']
|
test_names = ['VanillaTwoClusterTest.test_vanilla_two_cluster']
|
||||||
for test_name in test_names:
|
for test_name in test_names:
|
||||||
LOGGER.debug('Run platform test {0} for Sahara'.format(test_name))
|
LOGGER.debug('Run platform test {0} for Sahara'.format(test_name))
|
||||||
self.fuel_web.run_single_ostf_test(
|
self.fuel_web.run_single_ostf_test(
|
||||||
cluster_id=cluster_id, test_sets=['platform_tests'],
|
cluster_id=cluster_id, test_sets=['tests_platform'],
|
||||||
test_name=path_to_tests + test_name, timeout=60 * 200)
|
test_name=path_to_tests + test_name, timeout=60 * 200)
|
||||||
|
|
||||||
self.env.make_snapshot("deploy_sahara_ha_gre")
|
self.env.make_snapshot("deploy_sahara_ha_gre")
|
||||||
@ -307,7 +307,7 @@ class MuranoHAOneController(TestBasic):
|
|||||||
|
|
||||||
LOGGER.debug('Run OSTF platform tests')
|
LOGGER.debug('Run OSTF platform tests')
|
||||||
|
|
||||||
test_class_main = ('fuel_health.tests.platform_tests'
|
test_class_main = ('fuel_health.tests.tests_platform'
|
||||||
'.test_murano_linux.MuranoDeployLinuxServicesTests')
|
'.test_murano_linux.MuranoDeployLinuxServicesTests')
|
||||||
tests_names = ['test_deploy_dummy_app', ]
|
tests_names = ['test_deploy_dummy_app', ]
|
||||||
|
|
||||||
@ -319,7 +319,7 @@ class MuranoHAOneController(TestBasic):
|
|||||||
|
|
||||||
for test_name in test_classes:
|
for test_name in test_classes:
|
||||||
self.fuel_web.run_single_ostf_test(
|
self.fuel_web.run_single_ostf_test(
|
||||||
cluster_id=cluster_id, test_sets=['platform_tests'],
|
cluster_id=cluster_id, test_sets=['tests_platform'],
|
||||||
test_name=test_name, timeout=60 * 20)
|
test_name=test_name, timeout=60 * 20)
|
||||||
|
|
||||||
self.env.make_snapshot("deploy_murano_ha_one_controller_gre")
|
self.env.make_snapshot("deploy_murano_ha_one_controller_gre")
|
||||||
@ -396,7 +396,7 @@ class MuranoHA(TestBasic):
|
|||||||
|
|
||||||
LOGGER.debug('Run OSTF platform tests')
|
LOGGER.debug('Run OSTF platform tests')
|
||||||
|
|
||||||
test_class_main = ('fuel_health.tests.platform_tests'
|
test_class_main = ('fuel_health.tests.tests_platform'
|
||||||
'.test_murano_linux.MuranoDeployLinuxServicesTests')
|
'.test_murano_linux.MuranoDeployLinuxServicesTests')
|
||||||
tests_names = ['test_deploy_dummy_app', ]
|
tests_names = ['test_deploy_dummy_app', ]
|
||||||
|
|
||||||
@ -408,7 +408,7 @@ class MuranoHA(TestBasic):
|
|||||||
|
|
||||||
for test_name in test_classes:
|
for test_name in test_classes:
|
||||||
self.fuel_web.run_single_ostf_test(
|
self.fuel_web.run_single_ostf_test(
|
||||||
cluster_id=cluster_id, test_sets=['platform_tests'],
|
cluster_id=cluster_id, test_sets=['tests_platform'],
|
||||||
test_name=test_name, timeout=60 * 20)
|
test_name=test_name, timeout=60 * 20)
|
||||||
|
|
||||||
self.env.make_snapshot("deploy_murano_ha_with_gre")
|
self.env.make_snapshot("deploy_murano_ha_with_gre")
|
||||||
@ -428,7 +428,7 @@ class OSTFCeilometerHelper(TestBasic):
|
|||||||
|
|
||||||
LOGGER.debug('Run platform OSTF Ceilometer tests')
|
LOGGER.debug('Run platform OSTF Ceilometer tests')
|
||||||
|
|
||||||
test_class_main = ('fuel_health.tests.platform_tests.'
|
test_class_main = ('fuel_health.tests.tests_platform.'
|
||||||
'test_ceilometer.'
|
'test_ceilometer.'
|
||||||
'CeilometerApiPlatformTests')
|
'CeilometerApiPlatformTests')
|
||||||
tests_names = ['test_check_alarm_state',
|
tests_names = ['test_check_alarm_state',
|
||||||
@ -453,7 +453,7 @@ class OSTFCeilometerHelper(TestBasic):
|
|||||||
if skip_tests and test_id.split('.')[-1] in skip_tests:
|
if skip_tests and test_id.split('.')[-1] in skip_tests:
|
||||||
|
|
||||||
all_status = self.fuel_web.run_single_ostf_test(
|
all_status = self.fuel_web.run_single_ostf_test(
|
||||||
cluster_id=cluster_id, test_sets=['platform_tests'],
|
cluster_id=cluster_id, test_sets=['tests_platform'],
|
||||||
test_name=test_id, retries=True, timeout=60 * 20)
|
test_name=test_id, retries=True, timeout=60 * 20)
|
||||||
|
|
||||||
test_name = next(
|
test_name = next(
|
||||||
@ -471,7 +471,7 @@ class OSTFCeilometerHelper(TestBasic):
|
|||||||
'but his status {}'.format(test_name, status))
|
'but his status {}'.format(test_name, status))
|
||||||
else:
|
else:
|
||||||
self.fuel_web.run_single_ostf_test(
|
self.fuel_web.run_single_ostf_test(
|
||||||
cluster_id=cluster_id, test_sets=['platform_tests'],
|
cluster_id=cluster_id, test_sets=['tests_platform'],
|
||||||
test_name=test_id, timeout=60 * 20)
|
test_name=test_id, timeout=60 * 20)
|
||||||
|
|
||||||
|
|
||||||
@ -837,7 +837,7 @@ class HeatHAOneController(TestBasic):
|
|||||||
|
|
||||||
LOGGER.debug('Run Heat OSTF platform tests')
|
LOGGER.debug('Run Heat OSTF platform tests')
|
||||||
|
|
||||||
test_class_main = ('fuel_health.tests.platform_tests.'
|
test_class_main = ('fuel_health.tests.tests_platform.'
|
||||||
'test_heat.'
|
'test_heat.'
|
||||||
'HeatSmokeTests')
|
'HeatSmokeTests')
|
||||||
tests_names = ['test_actions',
|
tests_names = ['test_actions',
|
||||||
@ -854,7 +854,7 @@ class HeatHAOneController(TestBasic):
|
|||||||
|
|
||||||
for test_name in test_classes:
|
for test_name in test_classes:
|
||||||
self.fuel_web.run_single_ostf_test(
|
self.fuel_web.run_single_ostf_test(
|
||||||
cluster_id=cluster_id, test_sets=['platform_tests'],
|
cluster_id=cluster_id, test_sets=['tests_platform'],
|
||||||
test_name=test_name, timeout=60 * 60)
|
test_name=test_name, timeout=60 * 60)
|
||||||
|
|
||||||
self.env.make_snapshot("deploy_heat_ha_one_controller_neutron")
|
self.env.make_snapshot("deploy_heat_ha_one_controller_neutron")
|
||||||
@ -919,7 +919,7 @@ class HeatHAOneController(TestBasic):
|
|||||||
|
|
||||||
LOGGER.debug('Run Heat OSTF platform tests')
|
LOGGER.debug('Run Heat OSTF platform tests')
|
||||||
|
|
||||||
test_class_main = ('fuel_health.tests.platform_tests.'
|
test_class_main = ('fuel_health.tests.tests_platform.'
|
||||||
'test_heat.'
|
'test_heat.'
|
||||||
'HeatSmokeTests')
|
'HeatSmokeTests')
|
||||||
tests_names = ['test_actions',
|
tests_names = ['test_actions',
|
||||||
@ -936,7 +936,7 @@ class HeatHAOneController(TestBasic):
|
|||||||
|
|
||||||
for test_name in test_classes:
|
for test_name in test_classes:
|
||||||
self.fuel_web.run_single_ostf_test(
|
self.fuel_web.run_single_ostf_test(
|
||||||
cluster_id=cluster_id, test_sets=['platform_tests'],
|
cluster_id=cluster_id, test_sets=['tests_platform'],
|
||||||
test_name=test_name, timeout=60 * 60)
|
test_name=test_name, timeout=60 * 60)
|
||||||
|
|
||||||
self.env.make_snapshot("deploy_heat_ha_one_controller_nova")
|
self.env.make_snapshot("deploy_heat_ha_one_controller_nova")
|
||||||
@ -1013,7 +1013,7 @@ class HeatHA(TestBasic):
|
|||||||
|
|
||||||
LOGGER.debug('Run Heat OSTF platform tests')
|
LOGGER.debug('Run Heat OSTF platform tests')
|
||||||
|
|
||||||
test_class_main = ('fuel_health.tests.platform_tests.'
|
test_class_main = ('fuel_health.tests.tests_platform.'
|
||||||
'test_heat.'
|
'test_heat.'
|
||||||
'HeatSmokeTests')
|
'HeatSmokeTests')
|
||||||
tests_names = ['test_actions',
|
tests_names = ['test_actions',
|
||||||
@ -1030,7 +1030,7 @@ class HeatHA(TestBasic):
|
|||||||
|
|
||||||
for test_name in test_classes:
|
for test_name in test_classes:
|
||||||
self.fuel_web.run_single_ostf_test(
|
self.fuel_web.run_single_ostf_test(
|
||||||
cluster_id=cluster_id, test_sets=['platform_tests'],
|
cluster_id=cluster_id, test_sets=['tests_platform'],
|
||||||
test_name=test_name, timeout=60 * 60)
|
test_name=test_name, timeout=60 * 60)
|
||||||
|
|
||||||
self.env.make_snapshot("deploy_heat_ha")
|
self.env.make_snapshot("deploy_heat_ha")
|
||||||
|
@ -186,7 +186,7 @@ class VcenterDeploy(TestBasic):
|
|||||||
|
|
||||||
self.fuel_web.run_ostf(
|
self.fuel_web.run_ostf(
|
||||||
cluster_id=cluster_id, test_sets=['smoke', 'sanity', 'ha',
|
cluster_id=cluster_id, test_sets=['smoke', 'sanity', 'ha',
|
||||||
'platform_tests'])
|
'tests_platform'])
|
||||||
|
|
||||||
@test(depends_on=[SetupEnvironment.prepare_slaves_5],
|
@test(depends_on=[SetupEnvironment.prepare_slaves_5],
|
||||||
groups=["smoke", "vcenter_cindervmdk"])
|
groups=["smoke", "vcenter_cindervmdk"])
|
||||||
|
@ -232,7 +232,7 @@ class HugeHaNeutron(base_test_case.TestBasic):
|
|||||||
self.fuel_web.run_ostf(cluster_id=cluster_id,
|
self.fuel_web.run_ostf(cluster_id=cluster_id,
|
||||||
test_sets=['ha', 'smoke', 'sanity'])
|
test_sets=['ha', 'smoke', 'sanity'])
|
||||||
|
|
||||||
test_class_main = ('fuel_health.tests.platform_tests.'
|
test_class_main = ('fuel_health.tests.tests_platform.'
|
||||||
'test_ceilometer.'
|
'test_ceilometer.'
|
||||||
'CeilometerApiPlatformTests')
|
'CeilometerApiPlatformTests')
|
||||||
tests_names = ['test_check_alarm_state',
|
tests_names = ['test_check_alarm_state',
|
||||||
@ -241,7 +241,7 @@ class HugeHaNeutron(base_test_case.TestBasic):
|
|||||||
for test_name in tests_names]
|
for test_name in tests_names]
|
||||||
for test_name in test_classes:
|
for test_name in test_classes:
|
||||||
self.fuel_web.run_single_ostf_test(
|
self.fuel_web.run_single_ostf_test(
|
||||||
cluster_id=cluster_id, test_sets=['platform_tests'],
|
cluster_id=cluster_id, test_sets=['tests_platform'],
|
||||||
test_name=test_name, timeout=60 * 20)
|
test_name=test_name, timeout=60 * 20)
|
||||||
|
|
||||||
@test(depends_on=[base_test_case.SetupEnvironment.prepare_slaves_9],
|
@test(depends_on=[base_test_case.SetupEnvironment.prepare_slaves_9],
|
||||||
@ -320,7 +320,7 @@ class HugeHaNeutron(base_test_case.TestBasic):
|
|||||||
self.fuel_web.run_ostf(cluster_id=cluster_id,
|
self.fuel_web.run_ostf(cluster_id=cluster_id,
|
||||||
test_sets=['ha', 'smoke', 'sanity'])
|
test_sets=['ha', 'smoke', 'sanity'])
|
||||||
|
|
||||||
test_class_main = ('fuel_health.tests.platform_tests.'
|
test_class_main = ('fuel_health.tests.tests_platform.'
|
||||||
'test_ceilometer.'
|
'test_ceilometer.'
|
||||||
'CeilometerApiPlatformTests')
|
'CeilometerApiPlatformTests')
|
||||||
tests_names = ['test_check_alarm_state',
|
tests_names = ['test_check_alarm_state',
|
||||||
@ -329,5 +329,5 @@ class HugeHaNeutron(base_test_case.TestBasic):
|
|||||||
for test_name in tests_names]
|
for test_name in tests_names]
|
||||||
for test_name in test_classes:
|
for test_name in test_classes:
|
||||||
self.fuel_web.run_single_ostf_test(
|
self.fuel_web.run_single_ostf_test(
|
||||||
cluster_id=cluster_id, test_sets=['platform_tests'],
|
cluster_id=cluster_id, test_sets=['tests_platform'],
|
||||||
test_name=test_name, timeout=60 * 20)
|
test_name=test_name, timeout=60 * 20)
|
||||||
|
Loading…
Reference in New Issue
Block a user