diff options
| -rw-r--r-- | ansible/site.yml | 8 | ||||
| -rw-r--r-- | docker/benchmarking/Dockerfile | 10 | ||||
| -rw-r--r-- | docker/benchmarking/testcases.yaml | 11 | ||||
| -rw-r--r-- | docker/healthcheck/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/healthcheck/testcases.yaml | 18 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 5 | ||||
| -rw-r--r-- | docker/smoke/testcases.yaml | 34 | ||||
| -rw-r--r-- | functest/ci/testcases.yaml | 96 |
8 files changed, 125 insertions, 59 deletions
diff --git a/ansible/site.yml b/ansible/site.yml index a6f71522d..0458a2905 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -58,13 +58,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 @@ -73,12 +74,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 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 diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 19fd0aa5b..1932c45be 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-core +FROM opnfv/functest-tempest ARG BRANCH=master ARG OPENSTACK_TAG=master 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 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 diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index e5e762f30..2e0018d8b 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,31 +225,54 @@ 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 criteria: 100 @@ -364,6 +387,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 @@ -488,40 +522,6 @@ tiers: 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 criteria: 100 |