aboutsummaryrefslogtreecommitdiffstats
path: root/docker/benchmarking
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-02-06 07:48:36 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2019-02-06 11:39:36 +0100
commit1d0f0bbf773aaaf7139b76442a9e59d13bd32830 (patch)
tree0dae87f7969f46db78b4ceae82efdbf8c66f4355 /docker/benchmarking
parentf501b520f80d573a77cdae941fe19db216b94307 (diff)
Move testcases in the right tiers
Here are the moves: - tempest_smoke in healthcheck - tempest_full and tempest_scenario in smoke - rally_jobs in benchmarking It avoids conflicts between benchmarking tools and few functional tests (short timeouts). Then it should allow running in parallel all testcases in one tiers. It also allows cleaning the additional steps defined in releng. rally_full could move in benchmarking in a second step. Change-Id: I0bc657557a61c7d9bf7679b4f2dbda08c36728ca Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/benchmarking')
-rw-r--r--docker/benchmarking/Dockerfile10
-rw-r--r--docker/benchmarking/testcases.yaml11
2 files changed, 19 insertions, 2 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile
index ff87f56d6..294412238 100644
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-tempest
ARG BRANCH=master
ARG OPENSTACK_TAG=master
@@ -20,7 +20,13 @@ RUN apk --no-cache add --update libxml2 libxslt && \
update-requirements -s --source /src/openstack-requirements /src/vmtp/ && \
pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \
/src/vmtp && \
- rm -r upper-constraints.txt upper-constraints.opnfv.txt src/vmtp && \
+ mkdir -p /home/opnfv/functest/data/rally/neutron && \
+ git init /src/neutron && \
+ (cd /src/neutron && \
+ git fetch --tags https://git.openstack.org/openstack/neutron.git $OPENSTACK_TAG && \
+ git checkout FETCH_HEAD) && \
+ cp -r /src/neutron/rally-jobs /home/opnfv/functest/data/rally/neutron/rally-jobs && \
+ rm -r upper-constraints.txt upper-constraints.opnfv.txt src/vmtp /src/neutron && \
apk del .build-deps
COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
CMD ["run_tests", "-t", "all"]
diff --git a/docker/benchmarking/testcases.yaml b/docker/benchmarking/testcases.yaml
index 0c4372679..fd93cd354 100644
--- a/docker/benchmarking/testcases.yaml
+++ b/docker/benchmarking/testcases.yaml
@@ -8,6 +8,17 @@ tiers:
https://docs.openstack.org/performance-docs/latest/methodologies/tools.html
testcases:
-
+ case_name: rally_jobs
+ project_name: functest
+ criteria: 100
+ blocking: false
+ description: >-
+ This test case runs a group of Rally jobs used in
+ OpenStack gating
+ run:
+ name: rally_jobs
+
+ -
case_name: vmtp
project_name: functest
criteria: 100