From e46aa41172fa1bf63364505fbbf922323788ac98 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Sat, 26 Oct 2019 18:00:54 +0200 Subject: [PATCH] Add cinder-tempest-plugin MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 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 --- ansible/site.yml | 1 + docker/smoke/Dockerfile | 11 ++++++++++- docker/smoke/testcases.yaml | 16 ++++++++++++++++ docs/release/release-notes/functest-release.rst | 1 + functest/ci/testcases.yaml | 16 ++++++++++++++++ 5 files changed, 44 insertions(+), 1 deletion(-) diff --git a/ansible/site.yml b/ansible/site.yml index c5a9cac5d..e6ab09e8d 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -55,6 +55,7 @@ - container: functest-smoke tests: - neutron-tempest-plugin-api + - tempest_cinder - rally_sanity - refstack_compute - refstack_object diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 1de3ff696..e28e9ec78 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -5,10 +5,12 @@ ARG OPENSTACK_TAG=master ARG REFSTACK_TARGET=2018.11 ARG PATROLE_TAG=master ARG NEUTRON_TEMPEST_TAG=master +ARG CINDER_TEMPEST_TAG=master ARG BARBICAN_TAG=master ARG OCTAVIA_TAG=master -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 && \ @@ -26,6 +28,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 && \ @@ -38,6 +45,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 \ + /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 && \ @@ -49,6 +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/cinder-tempest-plugin \ /src/octavia-tempest-plugin /src/neutron && \ apk del .build-deps COPY compute.txt /home/opnfv/functest/data/refstack/compute.txt diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml index cb5e6ea9c..7ae4c9c3b 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 diff --git a/docs/release/release-notes/functest-release.rst b/docs/release/release-notes/functest-release.rst index cbcc159c2..806461733 100644 --- a/docs/release/release-notes/functest-release.rst +++ b/docs/release/release-notes/functest-release.rst @@ -36,6 +36,7 @@ The internal test cases are: * tempest_horizon * odl * neutron-tempest-plugin-api + * tempest_cinder * rally_sanity * refstack_compute * refstack_object diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 0b308b72a..d98de9e98 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -201,6 +201,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 -- 2.16.6