From 9b014796d26627074b33e0f772d691eebe60a429 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')
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 22e3f85f2..98460790d 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -6,11 +6,13 @@ ARG TEMPEST_TAG=21.0.0
ARG REFSTACK_TARGET=2018.11
ARG PATROLE_TAG=0.4.0
ARG NEUTRON_TEMPEST_TAG=0.3.0
+ARG CINDER_TEMPEST_TAG=0.1.0
ARG BARBICAN_TAG=0.1.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 \
python-dev build-base linux-headers libffi-dev \
- openssl-dev libjpeg-turbo-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 && \
sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/opendev.org\\/openstack\\/tempest@$TEMPEST_TAG#egg=tempest/ upper-constraints.txt && \
case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \
@@ -26,6 +28,11 @@ RUN apk --no-cache add --virtual .build-deps --update \
git fetch --tags https://opendev.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 && \
@@ -33,7 +40,7 @@ RUN apk --no-cache add --virtual .build-deps --update \
update-requirements -s --source /src/openstack-requirements /src/barbican-tempest-plugin/ && \
pip 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 && \
+ networking-bgpvpn networking-sfc /src/cinder-tempest-plugin && \
rm -r upper-constraints.txt upper-constraints.opnfv.txt \
/src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin && \
mkdir -p /home/opnfv/functest/data/refstack && \
diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index f5b756255..243f2857d 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