diff options
Diffstat (limited to 'docker/healthcheck')
-rw-r--r-- | docker/healthcheck/Dockerfile | 20 | ||||
-rw-r--r-- | docker/healthcheck/testcases.yaml | 9 |
2 files changed, 8 insertions, 21 deletions
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 885d501b2..404ff2d58 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,31 +1,15 @@ FROM opnfv/functest-core -ARG BRANCH=master -ARG OPENSTACK_TAG=master ARG ODL_TAG=89b88a0a23561f0bda62338b394ec41655679b2d -ARG TEMPEST_HORIZON_TAG=master COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --virtual .build-deps --update \ python3-dev build-base linux-headers libffi-dev openssl-dev && \ - wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \ - sed -i -E /^tempest==+.*$/d upper-constraints.txt && \ - case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \ - wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH > upper-constraints.opnfv.txt && \ - sed -i -E /#egg=functest/d upper-constraints.opnfv.txt && \ - git init /src/tempest-horizon && \ - (cd /src/tempest-horizon && \ - git fetch --tags https://opendev.org/openstack/tempest-horizon.git $TEMPEST_HORIZON_TAG && \ - git checkout FETCH_HEAD) && \ - update-requirements -s --source /src/openstack-requirements /src/tempest-horizon/ && \ - pip3 install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ - /src/tempest-horizon -rthirdparty-requirements.txt && \ git init /src/odl_test && \ (cd /src/odl_test && \ git fetch --tags https://git.opendaylight.org/gerrit/integration/test $ODL_TAG && \ git checkout FETCH_HEAD) && \ - rm -r /src/odl_test/.git /src/tempest-horizon/ thirdparty-requirements.txt \ - upper-constraints.txt upper-constraints.opnfv.txt && \ + rm -r /src/odl_test/.git thirdparty-requirements.txt && \ apk del .build-deps -COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml +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 c2a66494d..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 @@ -174,6 +177,6 @@ tiers: dependencies: - DASHBOARD_URL: '^(?!\s*$).+' run: - name: tempest_horizon + name: tempest_common args: - mode: '^tempest_horizon.' + mode: '^tempest.scenario.test_dashboard_basic_ops.' |