aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/smoke/Dockerfile12
-rw-r--r--docker/smoke/testcases.yaml17
-rw-r--r--docs/release/release-notes/functest-release.rst1
-rw-r--r--functest/ci/testcases.yaml17
4 files changed, 45 insertions, 2 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 06a32151e..8be1246e4 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -10,6 +10,7 @@ ARG BARBICAN_TAG=1.0.0
ARG OCTAVIA_TAG=1.4.0
ARG HEAT_TEMPEST_TAG=1.0.0
ARG TELEMETRY_TEMPEST_TAG=1.0.0
+ARG CYBORG_TEMPEST_TAG=1.0.0
RUN apk --no-cache add --update libxml2 libxslt && \
apk --no-cache add --virtual .build-deps --update \
@@ -58,11 +59,17 @@ RUN apk --no-cache add --update libxml2 libxslt && \
git fetch --tags https://git.openstack.org/openstack/telemetry-tempest-plugin.git $TELEMETRY_TEMPEST_TAG && \
git checkout FETCH_HEAD) && \
update-requirements -s --source /src/requirements /src/telemetry-tempest-plugin && \
+ git init /src/cyborg-tempest-plugin && \
+ (cd /src/cyborg-tempest-plugin && \
+ git fetch --tags https://git.openstack.org/openstack/cyborg-tempest-plugin.git $CYBORG_TEMPEST_TAG && \
+ git checkout FETCH_HEAD) && \
+ update-requirements -s --source /src/requirements /src/cyborg-tempest-plugin && \
pip3 install --no-cache-dir --src /src -c/src/requirements/upper-constraints.txt \
-c/src/functest/upper-constraints.txt \
/src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin \
/src/cinder-tempest-plugin /src/keystone-tempest-plugin \
- /src/octavia-tempest-plugin /src/heat-tempest-plugin /src/telemetry-tempest-plugin && \
+ /src/octavia-tempest-plugin /src/heat-tempest-plugin /src/telemetry-tempest-plugin \
+ /src/cyborg-tempest-plugin && \
mkdir -p /home/opnfv/functest/data/refstack && \
mkdir -p /etc/neutron /etc/glance && \
virtualenv --no-pip --no-setuptools --no-wheel oslo && . oslo/bin/activate && \
@@ -76,7 +83,8 @@ RUN apk --no-cache add --update libxml2 libxslt && \
rm -r oslo /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin \
/src/cinder-tempest-plugin /src/keystone-tempest-plugin \
/src/octavia-tempest-plugin /src/heat-tempest-plugin \
- /src/telemetry-tempest-plugin /src/neutron /src/glance && \
+ /src/telemetry-tempest-plugin /src/cyborg-tempest-plugin \
+ /src/neutron /src/glance && \
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 7141bff48..029d5de59 100644
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -269,3 +269,20 @@ tiers:
- octavia
option:
- '--concurrency=2'
+
+ -
+ case_name: tempest_cyborg
+ project_name: functest
+ criteria: 100
+ blocking: false
+ description: >-
+ It leverages on the tempest plugin containing tests used to
+ verify the functionality of a cyborg installation.
+ run:
+ name: tempest_common
+ args:
+ mode: '^cyborg_tempest_plugin'
+ services:
+ - cyborg
+ option:
+ - '--concurrency=4'
diff --git a/docs/release/release-notes/functest-release.rst b/docs/release/release-notes/functest-release.rst
index 074efc51a..dd7d22024 100644
--- a/docs/release/release-notes/functest-release.rst
+++ b/docs/release/release-notes/functest-release.rst
@@ -50,6 +50,7 @@ The internal test cases are:
* patrole
* tempest_barbican
* tempest_octavia
+ * tempest_cyborg
* rally_full
* rally_jobs
* vmtp
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index a4b39f8c4..2461da27b 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -448,6 +448,23 @@ tiers:
option:
- '--concurrency=2'
+ -
+ case_name: tempest_cyborg
+ project_name: functest
+ criteria: 100
+ blocking: false
+ description: >-
+ It leverages on the tempest plugin containing tests used to
+ verify the functionality of a cyborg installation.
+ run:
+ name: tempest_common
+ args:
+ mode: '^cyborg_tempest_plugin'
+ services:
+ - cyborg
+ option:
+ - '--concurrency=4'
+
-
name: smoke_cntt
order: 2