From 55019af5be734bc48fdd21caa67d83c9c88ed1af Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Sat, 26 Oct 2019 18:14:47 +0200 Subject: [PATCH] Add keystone-tempest-plugin MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 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 | 11 +++++++++-- docker/smoke/testcases.yaml | 15 +++++++++++++++ docs/release/release-notes/functest-release.rst | 1 + functest/ci/testcases.yaml | 15 +++++++++++++++ 5 files changed, 41 insertions(+), 2 deletions(-) diff --git a/ansible/site.yml b/ansible/site.yml index 63787fe2d..6f1d0506d 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -61,6 +61,7 @@ tests: - neutron-tempest-plugin-api - tempest_cinder + - tempest_keystone - rally_sanity - refstack_defcore - tempest_full diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 98460790d..84b24431d 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -7,6 +7,7 @@ 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 KEYSTONE_TEMPEST_TAG=0.1.0 ARG BARBICAN_TAG=0.1.0 RUN apk --no-cache add --update libxml2 libxslt && \ @@ -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 && \ @@ -40,9 +46,10 @@ RUN apk --no-cache add --update libxml2 libxslt && \ 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 /src/cinder-tempest-plugin && \ + networking-bgpvpn networking-sfc /src/cinder-tempest-plugin /src/keystone-tempest-plugin && \ rm -r upper-constraints.txt upper-constraints.opnfv.txt \ - /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin && \ + /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin \ + /src/cinder-tempest-plugin /src/keystone-tempest-plugin && \ mkdir -p /home/opnfv/functest/data/refstack && \ mkdir -p /etc/neutron /etc/glance && \ wget -q -O /etc/neutron/policy.json https://opendev.org/openstack/neutron/raw/branch/$OPENSTACK_TAG/etc/policy.json && \ diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml index 243f2857d..20958ab81 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 af4b12a6d..51db177b9 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_smoke * neutron-tempest-plugin-api * tempest_cinder + * tempest_keystone * rally_sanity * refstack_defcore * patrole diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 137274777..cf6fa49c1 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -202,6 +202,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 -- 2.16.6