summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2019-10-29 09:06:35 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-10-29 09:06:35 +0000
commitbb4c274ab05b2e90788995e92cb5e125c0474683 (patch)
tree448e6b7e1c2bc96fdbd8e3fa055ae41d68e77bc1
parent2c0b7a8e9e01c4f3b9f536119d870637d0ef0217 (diff)
parent22ec0c1008b81f368476d8cea84117a93d15dab2 (diff)
Merge "Add keystone-tempest-plugin"
-rw-r--r--ansible/site.yml1
-rw-r--r--docker/smoke/Dockerfile10
-rw-r--r--docker/smoke/testcases.yaml15
-rw-r--r--docs/release/release-notes/functest-release.rst1
-rw-r--r--functest/ci/testcases.yaml15
5 files changed, 40 insertions, 2 deletions
diff --git a/ansible/site.yml b/ansible/site.yml
index e6ab09e..294b2bc 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 e28e9ec..39e7be4 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 7ae4c9c..85dc996 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 8064617..f547ef9 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 d98de9e..a49a79b 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