Add Patrole compute testing

It stops leveraging on policy json files as it fails for Nova.

Change-Id: Ic70997d0ff8151956dc189739b8468def048aad7
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

3 files changed, 13 insertions, 22 deletions

diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index af31f70c4..1eaaf2b11 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -75,26 +75,17 @@ RUN apk --no-cache add --update libxml2 libxslt && \
         /src/octavia-tempest-plugin /src/heat-tempest-plugin /src/telemetry-tempest-plugin \
         /src/cyborg-tempest-plugin && \
     mkdir -p /home/opnfv/functest/data/refstack && \
-    mkdir -p /etc/neutron /etc/glance /etc/nova /etc/keystone /etc/cinder && \
-    virtualenv --no-pip --no-setuptools --no-wheel oslo && . oslo/bin/activate && \
     pip3 install --no-cache-dir --src /src -c/src/requirements/upper-constraints.txt \
         -c/src/functest/upper-constraints.txt \
-        oslo.policy -e git+https://opendev.org/openstack/neutron.git@$NEUTRON_TAG#egg=neutron \
-        -e git+https://opendev.org/openstack/glance.git@$GLANCE_TAG#egg=glance \
-        -e git+https://opendev.org/openstack/nova.git@$NOVA_TAG#egg=nova \
-        -e git+https://opendev.org/openstack/keystone.git@$KEYSTONE_TAG#egg=keystone \
-        -e git+https://opendev.org/openstack/cinder.git@$CINDER_TAG#egg=cinder && \
-    oslopolicy-sample-generator  --format json --output-file /etc/neutron/policy.json --namespace neutron && \
-    oslopolicy-sample-generator  --format json --output-file /etc/glance/policy.json --namespace glance && \
-    oslopolicy-sample-generator  --format json --output-file /etc/nova/policy.json --namespace nova && \
-    oslopolicy-sample-generator  --format json --output-file /etc/keystone/policy.json --namespace keystone && \
-    oslopolicy-sample-generator  --format json --output-file /etc/cinder/policy.json --namespace cinder && \
-    deactivate && \
-    rm -r oslo /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin \
+        git+https://opendev.org/openstack/neutron.git@$NEUTRON_TAG#egg=neutron \
+        git+https://opendev.org/openstack/glance.git@$GLANCE_TAG#egg=glance \
+        git+https://opendev.org/openstack/nova.git@$NOVA_TAG#egg=nova \
+        git+https://opendev.org/openstack/keystone.git@$KEYSTONE_TAG#egg=keystone \
+        git+https://opendev.org/openstack/cinder.git@$CINDER_TAG#egg=cinder && \
+    rm -r /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin \
         /src/cinder-tempest-plugin /src/keystone-tempest-plugin \
         /src/octavia-tempest-plugin /src/heat-tempest-plugin \
-        /src/telemetry-tempest-plugin /src/cyborg-tempest-plugin \
-        /src/neutron /src/glance /src/nova /src/keystone /src/cinder && \
+        /src/telemetry-tempest-plugin /src/cyborg-tempest-plugin && \
     apk del .build-deps
 COPY compute.txt /home/opnfv/functest/data/refstack/compute.txt
 COPY object.txt /home/opnfv/functest/data/refstack/object.txt
diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index c9e0aa0e3..ec131e33a 100644
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -221,7 +221,7 @@ tiers:
                           (?!.*test_show_auto_allocated_topology)\
                           (?!.*test_delete_auto_allocated_topology)\
                           (?=.*[.*\bslow\b.*])\
-                          (^patrole_tempest_plugin.tests.api.(image|network|volume))"
+                          (^patrole_tempest_plugin.tests.api.(compute|image|network|volume))"
                         option:
                             - '--concurrency=4'
 
@@ -240,7 +240,7 @@ tiers:
                           (?!.*test_show_auto_allocated_topology)\
                           (?!.*test_delete_auto_allocated_topology)\
                           (?=.*[.*\bslow\b.*])\
-                          (^patrole_tempest_plugin.tests.api.(image|network|volume))"
+                          (^patrole_tempest_plugin.tests.api.(compute|image|network|volume))"
                         option:
                             - '--concurrency=4'
 
@@ -259,7 +259,7 @@ tiers:
                           (?!.*test_show_auto_allocated_topology)\
                           (?!.*test_delete_auto_allocated_topology)\
                           (?=.*[.*\bslow\b.*])\
-                          (^patrole_tempest_plugin.tests.api.(image|network|volume))"
+                          (^patrole_tempest_plugin.tests.api.(compute|image|network|volume))"
                         option:
                             - '--concurrency=4'
 
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 8fe33273f..e89a59928 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -399,7 +399,7 @@ tiers:
                           (?!.*test_show_auto_allocated_topology)\
                           (?!.*test_delete_auto_allocated_topology)\
                           (?=.*[.*\bslow\b.*])\
-                          (^patrole_tempest_plugin.tests.api.(image|network|volume))"
+                          (^patrole_tempest_plugin.tests.api.(compute|image|network|volume))"
                         option:
                             - '--concurrency=4'
 
@@ -418,7 +418,7 @@ tiers:
                           (?!.*test_show_auto_allocated_topology)\
                           (?!.*test_delete_auto_allocated_topology)\
                           (?=.*[.*\bslow\b.*])\
-                          (^patrole_tempest_plugin.tests.api.(image|network|volume))"
+                          (^patrole_tempest_plugin.tests.api.(compute|image|network|volume))"
                         option:
                             - '--concurrency=4'
 
@@ -437,7 +437,7 @@ tiers:
                           (?!.*test_show_auto_allocated_topology)\
                           (?!.*test_delete_auto_allocated_topology)\
                           (?=.*[.*\bslow\b.*])\
-                          (^patrole_tempest_plugin.tests.api.(image|network|volume))"
+                          (^patrole_tempest_plugin.tests.api.(compute|image|network|volume))"
                         option:
                             - '--concurrency=4'