diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/components/testcases.yaml | 27 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 5 | ||||
| -rw-r--r-- | docker/smoke/testcases.yaml | 63 | ||||
| -rw-r--r-- | docker/tempest/Dockerfile | 13 |
4 files changed, 98 insertions, 10 deletions
diff --git a/docker/components/testcases.yaml b/docker/components/testcases.yaml index babe3e687..6292d339c 100644 --- a/docker/components/testcases.yaml +++ b/docker/components/testcases.yaml @@ -9,17 +9,38 @@ tiers: - case_name: tempest_full project_name: functest - criteria: 80 + 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: + module: 'functest.opnfv_tests.openstack.tempest.tempest' + class: 'TempestCommon' + 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 deplopyment. + the OpenStack deployment. + https://github.com/openstack/tempest/blob/18.0.0/tox.ini#L84 run: module: 'functest.opnfv_tests.openstack.tempest.tempest' class: 'TempestCommon' args: - mode: '^(tempest|neutron_tempest_plugin)\.' + mode: '(?!.*\[.*\bslow\b.*\])(^tempest\.scenario)' + option: + - '--concurrency=1' - case_name: rally_full diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index ff905e31b..1ed39bdc0 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -4,7 +4,7 @@ ARG BRANCH=master ARG OPENSTACK_TAG=stable/queens ARG REFSTACK_TARGET=2017.09 ARG PATROLE_TAG=0.3.0 -ARG VMTP_TAG=refs/changes/59/588459/1 +ARG VMTP_TAG=99b261ccccc2f8a08ee2d8fca9f54ef9d69899d7 RUN apk --no-cache add --update libxml2 libxslt && \ apk --no-cache add --virtual .build-deps --update \ @@ -26,7 +26,8 @@ RUN apk --no-cache add --update libxml2 libxslt && \ git clone --depth 1 https://github.com/openstack/barbican-tempest-plugin.git /src/barbican-tempest-plugin && \ update-requirements -s --source /src/openstack-requirements /src/barbican-tempest-plugin/ && \ pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ - /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin /src/vmtp && \ + /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin \ + networking-bgpvpn networking-sfc /src/vmtp && \ virtualenv --system-site-packages /src/tempest/.venv && \ rm -r upper-constraints.txt upper-constraints.opnfv.txt \ /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin /src/vmtp && \ diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml index 20112a68e..65190f414 100644 --- a/docker/smoke/testcases.yaml +++ b/docker/smoke/testcases.yaml @@ -16,12 +16,32 @@ tiers: 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: module: 'functest.opnfv_tests.openstack.tempest.tempest' class: 'TempestCommon' args: - mode: - '^(tempest|neutron_tempest_plugin)\.(api|scenario).*\[.*\bsmoke\b.*\]$' + mode: '(?=.*\[.*\bsmoke\b.*\])(^tempest\.api)' + option: + - '--concurrency=4' + + - + case_name: neutron-tempest-plugin-api + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case runs the Tempest suite proposed by the + Neutron project. The list of test cases is generated by + Tempest automatically and depends on the parameters of + the OpenStack deployment. + run: + module: 'functest.opnfv_tests.openstack.tempest.tempest' + class: 'TempestCommon' + args: + mode: '^neutron_tempest_plugin\.api' + option: + - '--concurrency=4' - case_name: rally_sanity @@ -135,6 +155,45 @@ tiers: - trunk-details - + case_name: networking-bgpvpn + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case runs OpenStack networking-bgpvpn Tempest + suite. The list of test cases is generated by Tempest + having as input the relevant regex. + run: + module: 'functest.opnfv_tests.openstack.tempest.tempest' + class: 'TempestCommon' + args: + mode: '^networking_bgpvpn_tempest\.' + neutron_extensions: + - bgpvpn + option: + - '--concurrency=4' + + - + case_name: networking-sfc + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case runs OpenStack networking-sfc Tempest + suite. The list of test cases is generated by Tempest + having as input the relevant regex. + run: + module: 'functest.opnfv_tests.openstack.tempest.tempest' + class: 'TempestCommon' + args: + mode: + '^(?:networking_sfc\.tests\.tempest_plugin.tests.api).*$' + neutron_extensions: + - sfc + option: + - '--concurrency=0' + + - case_name: barbican project_name: functest criteria: 100 diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile index 1d46955fe..a09a562fd 100644 --- a/docker/tempest/Dockerfile +++ b/docker/tempest/Dockerfile @@ -8,9 +8,16 @@ ARG OS_FAULTS_TAG=0.1.17 RUN apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev && \ - wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \ - sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \ - > upper-constraints.txt && \ + case $OPENSTACK_TAG in \ + master) \ + wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \ + sed -E s/^tempest==+.*$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest#egg=tempest/ \ + > upper-constraints.txt ;; \ + *) \ + wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \ + sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \ + > upper-constraints.txt ;; \ + esac && \ wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH | \ sed -E /#egg=functest/d > upper-constraints.opnfv.txt && \ pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ |