From b998a5ab4827012e45a349c302059b78ed6cd66f Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Sat, 26 Oct 2019 18:00:54 +0200
Subject: Add cinder-tempest-plugin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It adds tempest_cinder which runs the tests proposed by
cinder-tempest-plugin [1]. test_incremental_backup is disabled because
it currently fails vs Functest SUT (under analysis).

[1] https://opendev.org/openstack/cinder-tempest-plugin

Change-Id: I85b255eb05b9ab1c74c3829148da5230d6c7647e
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit e46aa41172fa1bf63364505fbbf922323788ac98)
---
 docker/smoke/Dockerfile     | 13 ++++++++++---
 docker/smoke/testcases.yaml | 16 ++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

(limited to 'docker/smoke')

diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 777934de7..561b436d8 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -6,10 +6,12 @@ ARG TEMPEST_TAG=21.0.0
 ARG REFSTACK_TARGET=2018.11
 ARG PATROLE_TAG=0.5.0
 ARG NEUTRON_TEMPEST_TAG=0.3.0
+ARG CINDER_TEMPEST_TAG=0.2.0
 ARG BARBICAN_TAG=0.1.0
 ARG OCTAVIA_TAG=1.0.0
 
-RUN apk --no-cache add --virtual .build-deps --update \
+RUN apk --no-cache add --update libxml2 libxslt && \
+    apk --no-cache add --virtual .build-deps --update \
         python3-dev build-base linux-headers libffi-dev \
         openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-dev && \
     wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \
@@ -27,6 +29,11 @@ RUN apk --no-cache add --virtual .build-deps --update \
         git fetch --tags https://git.openstack.org/openstack/neutron-tempest-plugin.git $NEUTRON_TEMPEST_TAG && \
         git checkout FETCH_HEAD) && \
     update-requirements -s --source /src/openstack-requirements /src/neutron-tempest-plugin && \
+    git init /src/cinder-tempest-plugin && \
+    (cd /src/cinder-tempest-plugin && \
+        git fetch --tags https://git.openstack.org/openstack/cinder-tempest-plugin.git $CINDER_TEMPEST_TAG && \
+        git checkout FETCH_HEAD) && \
+    update-requirements -s --source /src/openstack-requirements /src/cinder-tempest-plugin && \
     git init /src/barbican-tempest-plugin && \
     (cd /src/barbican-tempest-plugin && \
         git fetch --tags https://opendev.org/openstack/barbican-tempest-plugin.git $BARBICAN_TAG && \
@@ -39,7 +46,7 @@ RUN apk --no-cache add --virtual .build-deps --update \
     update-requirements -s --source /src/openstack-requirements /src/octavia-tempest-plugin && \
     pip3 install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \
         /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin \
-        networking-bgpvpn networking-sfc /src/octavia-tempest-plugin && \
+        networking-bgpvpn networking-sfc /src/cinder-tempest-plugin /src/octavia-tempest-plugin && \
     mkdir -p /home/opnfv/functest/data/refstack && \
     mkdir -p /etc/neutron /etc/cinder /etc/glance /etc/keystone /etc/nova && \
     wget -q -O /etc/glance/policy.json https://opendev.org/openstack/glance/raw/branch/$OPENSTACK_TAG/etc/policy.json && \
@@ -50,7 +57,7 @@ RUN apk --no-cache add --virtual .build-deps --update \
     deactivate && \
     rm -r oslo upper-constraints.txt upper-constraints.opnfv.txt \
         /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin \
-        /src/octavia-tempest-plugin && \
+        /src/cinder-tempest-plugin /src/octavia-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 bc894299f..ef16305b3 100644
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -23,6 +23,22 @@ tiers:
                         option:
                             - '--concurrency=4'
 
+            -
+                case_name: tempest_cinder
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    This test case runs the Tempest suite proposed by the
+                    Cinder project.
+                run:
+                    name: tempest_common
+                    args:
+                        mode:
+                            '(?!.*test_incremental_backup)(^cinder_tempest_plugin.)'
+                        option:
+                            - '--concurrency=4'
+
             -
                 case_name: rally_sanity
                 project_name: functest
-- 
cgit 1.2.3-korg