From f7e12cdd782fdb21a047eb9f009af52d2fa5c8db Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 11 Feb 2021 15:13:00 +0100 Subject: tempest_horizon has been merged into openstack/tempest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/openstack/tempest-horizon/commit/6883d8ff5a1cc2c20b4fea7b58ba8fcda12ec035 Change-Id: Ib978fdb5f208e0767091eda32bd2103cc88cf47c Signed-off-by: Cédric Ollivier --- docker/healthcheck/Dockerfile | 11 +---------- docker/healthcheck/testcases.yaml | 2 +- functest/ci/testcases.yaml | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index e8e5c6bb3..5ec2471a8 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 --use-deprecated=legacy-resolver --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 CMD ["run_tests", "-t", "all"] diff --git a/docker/healthcheck/testcases.yaml b/docker/healthcheck/testcases.yaml index 3ebe8cb67..53e5a6cd5 100644 --- a/docker/healthcheck/testcases.yaml +++ b/docker/healthcheck/testcases.yaml @@ -179,4 +179,4 @@ tiers: run: name: tempest_horizon args: - mode: '^tempest_horizon.' + mode: '^tempest.scenario.test_dashboard_basic_ops.' diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml index 525946bb0..33ce04176 100644 --- a/functest/ci/testcases.yaml +++ b/functest/ci/testcases.yaml @@ -179,7 +179,7 @@ tiers: run: name: tempest_horizon args: - mode: '^tempest_horizon.' + mode: '^tempest.scenario.test_dashboard_basic_ops.' - name: smoke -- cgit 1.2.3-korg