From 6d5520e99d2f8666d9baf4bde49c741d887d3ef3 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sat, 26 Oct 2019 18:14:47 +0200 Subject: Add keystone-tempest-plugin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It adds tempest_keystone which runs the tests proposed by keystone-tempest-plugin [1]. [1] https://opendev.org/openstack/keystone-tempest-plugin Change-Id: I83db584c37fe63a549ccf396b03e034778254b3a Signed-off-by: Cédric Ollivier (cherry picked from commit 22ec0c1008b81f368476d8cea84117a93d15dab2) --- ansible/site.yml | 1 + docker/smoke/Dockerfile | 10 ++++++++-- docker/smoke/testcases.yaml | 15 +++++++++++++++ docs/release/release-notes/functest-release.rst | 1 + functest/ci/testcases.yaml | 15 +++++++++++++++ 5 files changed, 40 insertions(+), 2 deletions(-) diff --git a/ansible/site.yml b/ansible/site.yml index 8cedb79dc..2848cf570 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -59,6 +59,7 @@ tests: - neutron-tempest-plugin-api - tempest_cinder + - tempest_keystone - rally_sanity - refstack_compute - refstack_object diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index a3ef067e6..102629e9d 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -6,6 +6,7 @@ ARG REFSTACK_TARGET=2018.11 ARG PATROLE_TAG=0.7.0 ARG NEUTRON_TEMPEST_TAG=0.6.0 ARG CINDER_TEMPEST_TAG=0.3.0 +ARG KEYSTONE_TEMPEST_TAG=0.3.0 ARG BARBICAN_TAG=0.3.0 ARG OCTAVIA_TAG=1.2.0 @@ -33,6 +34,11 @@ RUN apk --no-cache add --update libxml2 libxslt && \ 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/keystone-tempest-plugin && \ + (cd /src/keystone-tempest-plugin && \ + git fetch --tags https://git.openstack.org/openstack/keystone-tempest-plugin.git $KEYSTONE_TEMPEST_TAG && \ + git checkout FETCH_HEAD) && \ + update-requirements -s --source /src/openstack-requirements /src/keystone-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 && \ @@ -45,7 +51,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \ 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/cinder-tempest-plugin /src/keystone-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 && \ @@ -57,7 +63,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \ 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/cinder-tempest-plugin /src/keystone-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 7ae4c9c3b..85dc9969f 100644 --- a/docker/smoke/testcases.yaml +++ b/docker/smoke/testcases.yaml @@ -39,6 +39,21 @@ tiers: option: - '--concurrency=4' + - + case_name: tempest_keystone + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case runs the Tempest suite proposed by the + Keystone project. + run: + name: tempest_common + args: + mode: 'keystone_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 c223f6203..90d6bc98e 100644 --- a/docs/release/release-notes/functest-release.rst +++ b/docs/release/release-notes/functest-release.rst @@ -37,6 +37,7 @@ The internal test cases are: * odl * neutron-tempest-plugin-api * tempest_cinder + * tempest_keystone * rally_sanity * refstack_compute * refstack_object diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index d98de9e98..a49a79b16 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -217,6 +217,21 @@ tiers: option: - '--concurrency=4' + - + case_name: tempest_keystone + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case runs the Tempest suite proposed by the + Keystone project. + run: + name: tempest_common + args: + mode: 'keystone_tempest_plugin.' + option: + - '--concurrency=4' + - case_name: rally_sanity project_name: functest -- cgit 1.2.3-korg