diff options
Diffstat (limited to 'docker/healthcheck')
| -rw-r--r-- | docker/healthcheck/Dockerfile | 21 | ||||
| -rw-r--r-- | docker/healthcheck/testcases.yaml | 41 | ||||
| -rw-r--r-- | docker/healthcheck/thirdparty-requirements.txt | 2 |
3 files changed, 33 insertions, 31 deletions
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index aba2bbdee..404ff2d58 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,22 +1,15 @@ FROM opnfv/functest-core -ARG BRANCH=master -ARG OPENSTACK_TAG=master -ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4 +ARG ODL_TAG=89b88a0a23561f0bda62338b394ec41655679b2d COPY thirdparty-requirements.txt thirdparty-requirements.txt -RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \ - sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/git.openstack.org\\/openstack\\/tempest@\\1#egg=tempest/ \ - > upper-constraints.txt && \ - 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 \ - -rthirdparty-requirements.txt && \ +RUN apk --no-cache add --virtual .build-deps --update \ + python3-dev build-base linux-headers libffi-dev openssl-dev && \ git init /src/odl_test && \ (cd /src/odl_test && \ - git fetch --tags https://git.opendaylight.org/gerrit/p/integration/test.git $ODL_TAG && \ + git fetch --tags https://git.opendaylight.org/gerrit/integration/test $ODL_TAG && \ git checkout FETCH_HEAD) && \ - rm -r /src/odl_test/.git thirdparty-requirements.txt upper-constraints.txt \ - upper-constraints.opnfv.txt -COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml + rm -r /src/odl_test/.git thirdparty-requirements.txt && \ + apk del .build-deps +COPY testcases.yaml /etc/xtesting/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/docker/healthcheck/testcases.yaml b/docker/healthcheck/testcases.yaml index cdb13e53b..7b6b2a108 100644 --- a/docker/healthcheck/testcases.yaml +++ b/docker/healthcheck/testcases.yaml @@ -2,7 +2,6 @@ tiers: - name: healthcheck - order: 0 description: >- First tier to be executed to verify the basic operations in the VIM. @@ -28,6 +27,8 @@ tiers: It creates and configures all tenant network ressources required by advanced testcases (subnet, network and router). + dependencies: + - NO_TENANT_NETWORK: '^(?![tT]rue$)' run: name: tenantnetwork1 @@ -40,6 +41,8 @@ tiers: It creates new user/project before creating and configuring all tenant network ressources required by a testcase (subnet, network and router). + dependencies: + - NO_TENANT_NETWORK: '^(?![tT]rue$)' run: name: tenantnetwork2 @@ -146,28 +149,34 @@ tiers: - /src/odl_test/csit/suites/openstack/neutron - - case_name: api_check + case_name: tempest_smoke project_name: functest criteria: 100 - blocking: true + blocking: false description: >- - This test case verifies the retrieval of OpenStack clients: - Keystone, Glance, Neutron and Nova and may perform some - simple queries. When the config value of - snaps.use_keystone is True, functest must have access to - the cloud's private network. + 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: api_check + name: tempest_common + args: + mode: '(?=.*\[.*\bsmoke\b.*\])(^tempest\.api)' + option: + - '--concurrency=4' - - case_name: snaps_health_check + case_name: tempest_horizon project_name: functest criteria: 100 - blocking: true + blocking: false description: >- - This test case creates executes the SimpleHealthCheck - Python test class which creates an, image, flavor, network, - and Cirros VM instance and observes the console output to - validate the single port obtains the correct IP address. + This test case runs the Tempest suite proposed by the + Horizon project. + dependencies: + - DASHBOARD_URL: '^(?!\s*$).+' run: - name: snaps_health_check + name: tempest_common + args: + mode: '^tempest.scenario.test_dashboard_basic_ops.' diff --git a/docker/healthcheck/thirdparty-requirements.txt b/docker/healthcheck/thirdparty-requirements.txt index 6d7ee1226..f8e37e3cb 100644 --- a/docker/healthcheck/thirdparty-requirements.txt +++ b/docker/healthcheck/thirdparty-requirements.txt @@ -1,3 +1,3 @@ robotframework-httplibrary robotframework-requests -robotframework-sshlibrary;python_version=='2.7' +robotframework-sshlibrary |