diff options
| -rw-r--r-- | docker/benchmarking/testcases.yaml | 11 | ||||
| -rw-r--r-- | docker/components/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/components/hooks/post_checkout | 6 | ||||
| -rw-r--r-- | docker/components/testcases.yaml | 55 | ||||
| -rw-r--r-- | docker/vnf/testcases.yaml | 2 | ||||
| -rw-r--r-- | functest/ci/testcases.yaml | 30 |
6 files changed, 24 insertions, 84 deletions
diff --git a/docker/benchmarking/testcases.yaml b/docker/benchmarking/testcases.yaml index fd93cd354..95f88a096 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_full + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case runs the full suite of scenarios of the + OpenStack Rally suite using several threads and iterations. + run: + name: rally_full + + - case_name: rally_jobs project_name: functest criteria: 100 diff --git a/docker/components/Dockerfile b/docker/components/Dockerfile deleted file mode 100644 index db0ffc8e0..000000000 --- a/docker/components/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM opnfv/functest-tempest:hunter - -COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml -CMD ["run_tests", "-t", "all"] diff --git a/docker/components/hooks/post_checkout b/docker/components/hooks/post_checkout deleted file mode 100644 index 8d0e98124..000000000 --- a/docker/components/hooks/post_checkout +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -from="${DOCKER_REPO%/*}/functest-core:${DOCKER_TAG}" -sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile - -exit $? diff --git a/docker/components/testcases.yaml b/docker/components/testcases.yaml deleted file mode 100644 index d0bfa0afe..000000000 --- a/docker/components/testcases.yaml +++ /dev/null @@ -1,55 +0,0 @@ ---- -tiers: - - - name: components - order: 4 - 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 - criteria: 100 - blocking: false - description: >- - This test case runs the full suite of scenarios of the - OpenStack Rally suite using several threads and iterations. - run: - name: rally_full - args: - optional: - - 'gnocchi' diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml index 9822a515a..7d5548b38 100644 --- a/docker/vnf/testcases.yaml +++ b/docker/vnf/testcases.yaml @@ -2,7 +2,7 @@ tiers: - name: vnf - order: 5 + order: 4 description: >- Collection of VNF test cases. testcases: diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 0b75c2888..300159197 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -385,6 +385,17 @@ tiers: https://docs.openstack.org/performance-docs/latest/methodologies/tools.html testcases: - + case_name: rally_full + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case runs the full suite of scenarios of the + OpenStack Rally suite using several threads and iterations. + run: + name: rally_full + + - case_name: rally_jobs project_name: functest criteria: 100 @@ -510,25 +521,8 @@ tiers: name: stor4nfv_os - - name: components - order: 4 - description: >- - Extensive testing of OpenStack API. - testcases: - - - case_name: rally_full - project_name: functest - criteria: 100 - blocking: false - description: >- - This test case runs the full suite of scenarios of the - OpenStack Rally suite using several threads and iterations. - run: - name: rally_full - - - name: vnf - order: 5 + order: 4 description: >- Collection of VNF test cases. testcases: |