diff options
| -rw-r--r-- | docker/patrole/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/patrole/testcases.yaml | 2 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/patrole/patrole.py | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/docker/patrole/Dockerfile b/docker/patrole/Dockerfile index 6d211e8fe..959e44ff1 100644 --- a/docker/patrole/Dockerfile +++ b/docker/patrole/Dockerfile @@ -31,6 +31,9 @@ RUN apk --no-cache add --virtual .build-deps --update \ mkdir -p /etc/rally && \ printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \ mkdir -p /var/lib/rally/database && rally db create && \ + mkdir -p /etc/neutron /etc/glance && \ + wget -q -O /etc/neutron/policy.json https://raw.githubusercontent.com/openstack/neutron/$OPENSTACK_TAG/etc/policy.json && \ + wget -q -O /etc/glance/policy.json https://raw.githubusercontent.com/openstack/glance/$OPENSTACK_TAG/etc/policy.json && \ rm -r upper-constraints.txt /src/os-faults /src/rally && \ apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml diff --git a/docker/patrole/testcases.yaml b/docker/patrole/testcases.yaml index 10edc4e5d..5615a9055 100644 --- a/docker/patrole/testcases.yaml +++ b/docker/patrole/testcases.yaml @@ -20,3 +20,5 @@ tiers: run: module: 'functest.opnfv_tests.openstack.patrole.patrole' class: 'Patrole' + args: + role: 'admin' diff --git a/functest/opnfv_tests/openstack/patrole/patrole.py b/functest/opnfv_tests/openstack/patrole/patrole.py index 226f6812d..8f30c482d 100644 --- a/functest/opnfv_tests/openstack/patrole/patrole.py +++ b/functest/opnfv_tests/openstack/patrole/patrole.py @@ -29,7 +29,8 @@ class Patrole(tempest.TempestCommon): if "case_name" not in kwargs: kwargs["case_name"] = 'patrole' super(Patrole, self).__init__(**kwargs) - self.mode = "^patrole_tempest_plugin." + self.mode = ("'(?!.*test_networks_multiprovider_rbac)" + "(?=patrole_tempest_plugin.tests.api.(image|network))'") self.res_dir = os.path.join( getattr(config.CONF, 'dir_results'), 'patrole') self.raw_list = os.path.join(self.res_dir, 'test_raw_list.txt') |