summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-07-16 10:01:56 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-07-16 10:01:56 +0200
commit7ddaa0e56b99e298566df2c9f29107390c0bb2fd (patch)
tree908f69754d8f3cacaf97dfb0fd8a4e8a28d6f06b
parentc0d35433a49200899d4e3e888d622c56e3a3cf43 (diff)
Rename Patrole config fields
Else it conflicts with the new tempest config fields [1]. It makes sense to switch to includes here. [1] https://build.opnfv.org/ci/view/functest/job/functest-compass-virtual-daily-master/566/console Change-Id: If7b3025b4003ea5704c6a3cdeae8cd00f1c5509e Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--docker/smoke/testcases.yaml4
-rw-r--r--functest/ci/testcases.yaml4
-rw-r--r--functest/opnfv_tests/openstack/patrole/patrole.py4
3 files changed, 6 insertions, 6 deletions
diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index b59af41a7..f364bdef1 100644
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -61,10 +61,10 @@ tiers:
class: 'Patrole'
args:
role: 'admin'
- services:
+ includes:
- 'image'
- 'network'
- exclude:
+ excludes:
- 'test_networks_multiprovider_rbac'
-
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index a9e023e4c..1d3540603 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -252,10 +252,10 @@ tiers:
class: 'Patrole'
args:
role: 'admin'
- services:
+ includes:
- 'image'
- 'network'
- exclude:
+ excludes:
- 'test_networks_multiprovider_rbac'
-
diff --git a/functest/opnfv_tests/openstack/patrole/patrole.py b/functest/opnfv_tests/openstack/patrole/patrole.py
index efc513cdb..45378b6cd 100644
--- a/functest/opnfv_tests/openstack/patrole/patrole.py
+++ b/functest/opnfv_tests/openstack/patrole/patrole.py
@@ -32,9 +32,9 @@ class Patrole(tempest.TempestCommon):
self.backup_tempest_config(self.conf_file, self.res_dir)
def run(self, **kwargs):
- for exclude in kwargs.get('exclude', []):
+ for exclude in kwargs.get('excludes', []):
kwargs['mode'] = "{}(?!.*{})".format(
kwargs.get('mode', ''), exclude)
kwargs['mode'] = '{}(?=patrole_tempest_plugin.tests.api.({}))'.format(
- kwargs['mode'], '|'.join(kwargs.get('services', [])))
+ kwargs['mode'], '|'.join(kwargs.get('includes', [])))
return super(Patrole, self).run(**kwargs)