diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2018-11-07 10:13:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-11-07 10:13:54 +0000 |
| commit | 58c5d1a3f7346c372105f9e10a521727579d461e (patch) | |
| tree | d85961e12b1e7c039e1e677832af9cfb26b5a8d2 /functest/opnfv_tests/openstack | |
| parent | 24a7b14c20ad96f10db0d8bfa6187c1b7c9737b9 (diff) | |
| parent | 3b07c3e741e0e64603d01afc651176aa2fc52391 (diff) | |
Merge "Disable agent testing in tempest-based testcases"
Diffstat (limited to 'functest/opnfv_tests/openstack')
3 files changed, 13 insertions, 3 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 6d301a624..12671d4c1 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -36,7 +36,7 @@ GLANCE_IMAGE_PATH = os.path.join( TEMPEST_CUSTOM = pkg_resources.resource_filename( 'functest', 'opnfv_tests/openstack/tempest/custom_tests/test_list.txt') TEMPEST_BLACKLIST = pkg_resources.resource_filename( - 'functest', 'opnfv_tests/openstack/tempest/custom_tests/blacklist.txt') + 'functest', 'opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml') TEMPEST_CONF_YAML = pkg_resources.resource_filename( 'functest', 'opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml') diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.txt b/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.txt deleted file mode 100644 index bb1aed339..000000000 --- a/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.txt +++ /dev/null @@ -1,2 +0,0 @@ - -- diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml b/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml new file mode 100644 index 000000000..224bd9a30 --- /dev/null +++ b/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml @@ -0,0 +1,12 @@ +--- +- + scenarios: + - os-ovn-nofeature-ha + tests: + - neutron_tempest_plugin.api.admin.test_agent_management + - neutron_tempest_plugin.api.admin.test_dhcp_agent_scheduler + - patrole_tempest_plugin.tests.api.network.test_agents_rbac + - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_network_type + - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_segmentation_id + - tempest.api.network.admin.test_agent_management + - tempest.api.network.admin.test_dhcp_agent_scheduler |