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) --- ansible/site.yml | 8 ++-- docker/benchmarking/Dockerfile | 10 +++- docker/benchmarking/testcases.yaml | 11 +++++ docker/healthcheck/Dockerfile | 2 +- docker/healthcheck/testcases.yaml | 18 +++++++ docker/smoke/Dockerfile | 8 ---- docker/smoke/testcases.yaml | 34 ++++++++++++++ functest/ci/testcases.yaml | 96 +++++++++++++++++++------------------- 8 files changed, 124 insertions(+), 63 deletions(-) diff --git a/ansible/site.yml b/ansible/site.yml index 190d5dedd..0e67b3e37 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -61,13 +61,14 @@ - odl - api_check - snaps_health_check + - tempest_smoke - container: functest-smoke tests: - - tempest_smoke - neutron-tempest-plugin-api - rally_sanity - - rally_jobs - refstack_defcore + - tempest_full + - tempest_scenario - patrole - snaps_smoke - neutron_trunk @@ -76,12 +77,11 @@ - barbican - container: functest-benchmarking tests: + - rally_jobs - vmtp - shaker - container: functest-components tests: - - tempest_full - - tempest_scenario - rally_full - container: functest-vnf tests: 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 diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 3c91f7b3e..3e9c9e2af 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-core:hunter +FROM opnfv/functest-tempest:hunter ARG BRANCH=stable/hunter ARG OPENSTACK_TAG=stable/rocky diff --git a/docker/healthcheck/testcases.yaml b/docker/healthcheck/testcases.yaml index cdb13e53b..e3eb028c9 100644 --- a/docker/healthcheck/testcases.yaml +++ b/docker/healthcheck/testcases.yaml @@ -171,3 +171,21 @@ tiers: validate the single port obtains the correct IP address. run: name: snaps_health_check + + - + case_name: tempest_smoke + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case runs the smoke subset of the OpenStack + Tempest suite. The list of test cases is generated by + Tempest automatically and depends on the parameters of + the OpenStack deplopyment. + https://github.com/openstack/tempest/blob/18.0.0/tox.ini#L114 + run: + name: tempest_common + args: + mode: '(?=.*\[.*\bsmoke\b.*\])(^tempest\.api)' + option: + - '--concurrency=4' 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 @@ -83,6 +83,40 @@ tiers: option: - '--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 diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 8b088b38c..e99b96107 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -172,12 +172,6 @@ tiers: run: name: snaps_health_check - - - name: smoke - order: 1 - description: >- - Set of basic Functional tests to validate the OPNFV scenarios. - testcases: - case_name: tempest_smoke project_name: functest @@ -196,6 +190,12 @@ tiers: option: - '--concurrency=4' + - + name: smoke + order: 1 + description: >- + Set of basic Functional tests to validate the OPNFV scenarios. + testcases: - case_name: neutron-tempest-plugin-api project_name: functest @@ -225,30 +225,53 @@ tiers: name: rally_sanity - - case_name: rally_jobs + case_name: refstack_defcore project_name: functest criteria: 100 blocking: false description: >- - This test case runs a group of Rally jobs used in - OpenStack gating + This test case runs a sub group of tests of the OpenStack + Defcore testcases. run: - name: rally_jobs + name: refstack_defcore + args: + option: + - '--concurrency=4' - - case_name: refstack_defcore + case_name: tempest_full project_name: functest criteria: 100 blocking: false description: >- - This test case runs a sub group of tests of the OpenStack - Defcore testcases. + 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: refstack_defcore + 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 @@ -361,6 +384,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 @@ -481,40 +515,6 @@ tiers: description: >- Extensive testing of OpenStack API. testcases: - - - 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: rally_full project_name: functest -- cgit 1.2.3-korg