aboutsummaryrefslogtreecommitdiffstats
path: root/docker/healthcheck
diff options
context:
space:
mode:
Diffstat (limited to 'docker/healthcheck')
-rw-r--r--docker/healthcheck/Dockerfile13
-rw-r--r--docker/healthcheck/testcases.yaml8
2 files changed, 8 insertions, 13 deletions
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 4d55e93f9..404ff2d58 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,24 +1,15 @@
FROM opnfv/functest-core
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 && \
- 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/requirements /src/tempest-horizon/ && \
- pip3 install --no-cache-dir --src /src -c/src/requirements/upper-constraints.txt \
- -c/src/functest/upper-constraints.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 && \
+ 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 ff743f0d4..7b6b2a108 100644
--- a/docker/healthcheck/testcases.yaml
+++ b/docker/healthcheck/testcases.yaml
@@ -27,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
@@ -39,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
@@ -173,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.'