diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-02-06 07:48:36 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-02-06 11:39:36 +0100 |
| commit | 1d0f0bbf773aaaf7139b76442a9e59d13bd32830 (patch) | |
| tree | 0dae87f7969f46db78b4ceae82efdbf8c66f4355 /docker/smoke | |
| parent | f501b520f80d573a77cdae941fe19db216b94307 (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/smoke')
| -rw-r--r-- | docker/smoke/Dockerfile | 5 | ||||
| -rw-r--r-- | docker/smoke/testcases.yaml | 34 |
2 files changed, 35 insertions, 4 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 2511c6ad9..f360352e8 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -4,7 +4,6 @@ ARG BRANCH=master ARG OPENSTACK_TAG=master ARG REFSTACK_TARGET=2018.02 ARG PATROLE_TAG=master -ARG NEUTRON_TAG=master ARG BARBICAN_TAG=master RUN apk --no-cache add --virtual .build-deps --update \ @@ -49,10 +48,8 @@ RUN apk --no-cache add --virtual .build-deps --update \ oslopolicy-sample-generator --format json --output-file /etc/neutron/policy.json --namespace neutron && \ oslopolicy-sample-generator --format json --output-file /etc/nova/policy.json --namespace nova && \ deactivate && \ - mkdir -p /home/opnfv/functest/data/rally/neutron && \ - cp -r /src/neutron/rally-jobs /home/opnfv/functest/data/rally/neutron/rally-jobs && \ rm -r oslo upper-constraints.txt upper-constraints.opnfv.txt \ - /src/neutron /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin && \ + /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin && \ 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/smoke/testcases.yaml b/docker/smoke/testcases.yaml index a811257a1..2392d8563 100644 --- a/docker/smoke/testcases.yaml +++ b/docker/smoke/testcases.yaml @@ -84,6 +84,40 @@ tiers: - '--concurrency=4' - + case_name: tempest_full + project_name: functest + criteria: 100 + blocking: false + description: >- + The list of test cases is generated by + Tempest automatically and depends on the parameters of + the OpenStack deployment. + https://github.com/openstack/tempest/blob/18.0.0/tox.ini#L83 + run: + name: tempest_common + args: + mode: '(?!.*\[.*\bslow\b.*\])(^tempest\.api)' + option: + - '--concurrency=4' + + - + case_name: tempest_scenario + project_name: functest + criteria: 100 + blocking: false + description: >- + The list of test cases is generated by + Tempest automatically and depends on the parameters of + the OpenStack deployment. + https://github.com/openstack/tempest/blob/18.0.0/tox.ini#L84 + run: + name: tempest_common + args: + mode: '(?!.*\[.*\bslow\b.*\])(^tempest\.scenario)' + option: + - '--concurrency=1' + + - case_name: patrole project_name: functest criteria: 100 |