diff options
author | Cedric Ollivier <cedric.ollivier@orange.com> | 2019-10-29 09:06:13 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2019-10-29 09:06:13 +0000 |
commit | ec22d91ea0ddf2927bf0fa5e48ec8f6141dc1231 (patch) | |
tree | 9da4e7ac3f764816dedbfae4734e752133497f9b /docker/healthcheck/Dockerfile | |
parent | 66631dfdbc2fcacc7a397ecaa6bcac9937177808 (diff) | |
parent | 7b03643170974d4307e0f630e4c79340df98e06f (diff) |
Merge "Add healthcheck Horizon tests"
Diffstat (limited to 'docker/healthcheck/Dockerfile')
-rw-r--r-- | docker/healthcheck/Dockerfile | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 451115cad..1876b5e43 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -3,6 +3,7 @@ FROM opnfv/functest-core ARG BRANCH=master ARG OPENSTACK_TAG=master ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4 +ARG TEMPEST_HORIZON_TAG=master COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --virtual .build-deps --update \ @@ -12,14 +13,19 @@ RUN apk --no-cache add --virtual .build-deps --update \ 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 \ - -rthirdparty-requirements.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 thirdparty-requirements.txt upper-constraints.txt \ - upper-constraints.opnfv.txt && \ + rm -r /src/odl_test/.git /src/tempest-horizon/ thirdparty-requirements.txt \ + upper-constraints.txt upper-constraints.opnfv.txt && \ apk del .build-deps COPY testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] |