diff options
| -rw-r--r-- | ansible/site.yml | 1 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 13 | ||||
| -rw-r--r-- | docker/smoke/testcases.yaml | 16 | ||||
| -rw-r--r-- | docs/release/release-notes/functest-release.rst | 1 | ||||
| -rw-r--r-- | functest/ci/testcases.yaml | 16 |
5 files changed, 44 insertions, 3 deletions
diff --git a/ansible/site.yml b/ansible/site.yml index dd449cd33..dd8d965db 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -58,6 +58,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 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 @@ -24,6 +24,22 @@ tiers: - '--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 criteria: 100 diff --git a/docs/release/release-notes/functest-release.rst b/docs/release/release-notes/functest-release.rst index 397664118..4565f10ba 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 ba134aa63..132c6b1aa 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -202,6 +202,22 @@ tiers: - '--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 criteria: 100 |