summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2018-11-07 10:14:01 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-11-07 10:14:01 +0000
commitf7cccc6d791bcd9a4aa9b0cc48800b0df3ec86cf (patch)
tree6cb03afc1ca72ff3a708af82bf092c33709eabd9
parenta91173fb3b0285c1fc1065e51a07625fdbb57abf (diff)
parent81936769f11d3cc4f12ea763b64b9995a3343da1 (diff)
Merge "Disable agent testing in tempest-based testcases" into stable/hunter
-rw-r--r--functest/opnfv_tests/openstack/tempest/conf_utils.py2
-rw-r--r--functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.txt2
-rw-r--r--functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml12
-rw-r--r--tox.ini1
4 files changed, 14 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
diff --git a/tox.ini b/tox.ini
index 5f474380b..719efafce 100644
--- a/tox.ini
+++ b/tox.ini
@@ -81,6 +81,7 @@ files =
docker
functest/ci
functest/opnfv_tests/openstack/rally/rally_jobs.yaml
+ functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml
functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
functest/opnfv_tests/vnf
commands =