diff options
| -rw-r--r-- | docker/smoke/Dockerfile | 11 | ||||
| -rw-r--r-- | docker/smoke/testcases.yaml | 18 | ||||
| -rw-r--r-- | functest/ci/testcases.yaml | 18 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml | 2 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/tempest.py | 9 |
5 files changed, 51 insertions, 7 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index d7f93cf71..1de3ff696 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -6,6 +6,7 @@ ARG REFSTACK_TARGET=2018.11 ARG PATROLE_TAG=master ARG NEUTRON_TEMPEST_TAG=master ARG BARBICAN_TAG=master +ARG OCTAVIA_TAG=master RUN apk --no-cache add --virtual .build-deps --update \ python3-dev build-base linux-headers libffi-dev \ @@ -30,8 +31,14 @@ RUN apk --no-cache add --virtual .build-deps --update \ git fetch --tags https://opendev.org/openstack/barbican-tempest-plugin.git $BARBICAN_TAG && \ git checkout FETCH_HEAD) && \ update-requirements -s --source /src/openstack-requirements /src/barbican-tempest-plugin/ && \ + git init /src/octavia-tempest-plugin && \ + (cd /src/octavia-tempest-plugin && \ + git fetch --tags https://git.openstack.org/openstack/octavia-tempest-plugin.git $OCTAVIA_TAG && \ + git checkout FETCH_HEAD) && \ + update-requirements -s --source /src/openstack-requirements /src/octavia-tempest-plugin && \ pip3 install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ - /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin && \ + /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin \ + /src/octavia-tempest-plugin && \ mkdir -p /home/opnfv/functest/data/refstack && \ mkdir -p /etc/neutron /etc/cinder /etc/glance /etc/keystone /etc/nova && \ wget -q -O /etc/glance/policy.json https://opendev.org/openstack/glance/raw/branch/$OPENSTACK_TAG/etc/policy.json && \ @@ -42,7 +49,7 @@ RUN apk --no-cache add --virtual .build-deps --update \ deactivate && \ rm -r oslo upper-constraints.txt upper-constraints.opnfv.txt \ /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin \ - /src/neutron && \ + /src/octavia-tempest-plugin /src/neutron && \ apk del .build-deps COPY compute.txt /home/opnfv/functest/data/refstack/compute.txt COPY object.txt /home/opnfv/functest/data/refstack/object.txt diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml index 8155f332c..a697dd162 100644 --- a/docker/smoke/testcases.yaml +++ b/docker/smoke/testcases.yaml @@ -232,3 +232,21 @@ tiers: '^barbican_tempest_plugin.((?!test_signed_image_upload_boot_failure).)*$' services: - barbican + + - + case_name: octavia + project_name: functest + criteria: 100 + blocking: false + description: >- + It leverages on the tempest plugin containing tests used to + verify the functionality of an octavia installation. + run: + name: tempest_common + args: + mode: + '^octavia_tempest_plugin.tests.api.v2' + services: + - octavia + option: + - '--concurrency=2' diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index c8f1a65dc..6a133dda1 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -396,6 +396,24 @@ tiers: services: - barbican + - + case_name: octavia + project_name: functest + criteria: 100 + blocking: false + description: >- + It leverages on the tempest plugin containing tests used to + verify the functionality of an octavia installation. + run: + name: tempest_common + args: + mode: + '^octavia_tempest_plugin.tests.api.v2' + services: + - octavia + option: + - '--concurrency=2' + - name: benchmarking order: 2 diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml index 06c77efd9..ff67bf015 100644 --- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml +++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml @@ -24,3 +24,5 @@ volume: storage_protocol: iSCSI volume-feature-enabled: backup: true +load_balancer: + test_with_noop: true diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index be86cee86..9c84cdc82 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -368,18 +368,17 @@ class TempestCommon(singlevm.VmReady2): black_list_file.close() for item in black_list_yaml: scenarios = item['scenarios'] - if deploy_scenario in scenarios: + in_it = rally.RallyBase.in_iterable_re + if in_it(deploy_scenario, scenarios): tests = item['tests'] - for test in tests: - black_tests.append(test) - break + black_tests.extend(tests) except Exception: # pylint: disable=broad-except black_tests = [] LOGGER.debug("Tempest blacklist file does not exist.") for cases_line in cases_file: for black_tests_line in black_tests: - if black_tests_line in cases_line: + if re.search(black_tests_line, cases_line): break else: result_file.write(str(cases_line) + '\n') |