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-07 10:55:54 +0100 |
| commit | b5fdcf01dc3a17e25800d9dc679c541cb3496007 (patch) | |
| tree | 20ec15297b8e028d89f860b690546a7962348170 /docker/smoke | |
| parent | c98c5ebe9b4da03c054e1fb702aede596e43da70 (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>
(cherry picked from commit 1d0f0bbf773aaaf7139b76442a9e59d13bd32830)
Diffstat (limited to 'docker/smoke')
| -rw-r--r-- | docker/smoke/Dockerfile | 8 | ||||
| -rw-r--r-- | docker/smoke/testcases.yaml | 34 |
2 files changed, 34 insertions, 8 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index e5e266141..08269a5c3 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -7,7 +7,6 @@ ARG REFSTACK_TARGET=2018.02 ARG PATROLE_TAG=0.4.0 ARG NEUTRON_TAG=0.2.0 ARG BARBICAN_TAG=0.1.0 -ARG NEUTRON_RALLY_TAG=$OPENSTACK_TAG RUN apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ @@ -43,13 +42,6 @@ RUN apk --no-cache add --virtual .build-deps --update \ mkdir -p /etc/neutron /etc/glance && \ wget -q -O /etc/neutron/policy.json https://git.openstack.org/cgit/openstack/neutron/plain/etc/policy.json?h=$OPENSTACK_TAG && \ wget -q -O /etc/glance/policy.json https://git.openstack.org/cgit/openstack/glance/plain/etc/policy.json?h=$OPENSTACK_TAG && \ - git init /src/neutron && \ - (cd /src/neutron && \ - git fetch --tags https://git.openstack.org/openstack/neutron.git $NEUTRON_RALLY_TAG && \ - git checkout FETCH_HEAD) && \ - mkdir -p /home/opnfv/functest/data/rally/neutron && \ - cp -r /src/neutron/rally-jobs /home/opnfv/functest/data/rally/neutron/rally-jobs && \ - rm -r /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/smoke/testcases.yaml b/docker/smoke/testcases.yaml index ca8adbca5..18239fa45 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 |