From b5fdcf01dc3a17e25800d9dc679c541cb3496007 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Wed, 6 Feb 2019 07:48:36 +0100 Subject: Move testcases in the right tiers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit 1d0f0bbf773aaaf7139b76442a9e59d13bd32830) --- docker/benchmarking/Dockerfile | 10 ++++++++-- docker/benchmarking/testcases.yaml | 11 +++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) (limited to 'docker/benchmarking') diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index ff3b63723..7f58c00e6 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-core:hunter +FROM opnfv/functest-tempest:hunter ARG BRANCH=stable/hunter ARG OPENSTACK_TAG=stable/rocky @@ -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 @@ -7,6 +7,17 @@ tiers: Run several OpenStack performance tools 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 -- cgit 1.2.3-korg