Merge "Add keystone-tempest-plugin"

5 files changed, 40 insertions, 2 deletions

diff --git a/ansible/site.yml b/ansible/site.yml
index e6ab09e8d..294b2bc15 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -56,6 +56,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 e28e9ec78..39e7be464 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -6,6 +6,7 @@ ARG REFSTACK_TARGET=2018.11
 ARG PATROLE_TAG=master
 ARG NEUTRON_TEMPEST_TAG=master
 ARG CINDER_TEMPEST_TAG=master
+ARG KEYSTONE_TEMPEST_TAG=master
 ARG BARBICAN_TAG=master
 ARG OCTAVIA_TAG=master
 
@@ -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
@@ -40,6 +40,21 @@ tiers:
                             - '--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
                 criteria: 100
diff --git a/docs/release/release-notes/functest-release.rst b/docs/release/release-notes/functest-release.rst
index 806461733..f547ef99b 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
@@ -218,6 +218,21 @@ tiers:
                             - '--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
                 criteria: 100