diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-06-14 12:51:22 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-06-15 13:45:23 +0200 |
| commit | 16a669689107956a9e9b3924b2478b074b44fc90 (patch) | |
| tree | 6c986375d0347d549f76a801d073b119d90c5bf2 /docker/healthcheck/Dockerfile | |
| parent | 60c59235a1e16d3773bd621fe1a85723f3b07f7b (diff) | |
Clone repositories instead of wgetting constraints
It stops leveraging on wget to get constraints as it fails since
opendev was created. Then functest and requirements are no longer
removed for functest-core which simplifies all child Dockerfile.
It also fix the current incompatibilities in OpenStack constraints
ERROR: cliff 3.2.0 has requirement cmd2!=0.8.3,<0.9.0,>=0.8.0, but you'll have cmd2 1.1.0 which is incompatible.
https://github.com/openstack/requirements/blob/master/upper-constraints.txt#L230
https://github.com/openstack/requirements/blob/master/upper-constraints.txt#L416
Change-Id: I7c044208ef26ad047fb841710b422acb6c9f0320
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 961b940c796871e40146b90cf19b48390310dd59)
Diffstat (limited to 'docker/healthcheck/Dockerfile')
| -rw-r--r-- | docker/healthcheck/Dockerfile | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index 610b7daf8..14fa563ab 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,35 +1,24 @@ FROM opnfv/functest-core:jerma -ARG BRANCH=stable/jerma -ARG OPENSTACK_TAG=stable/train ARG ODL_TAG=89b88a0a23561f0bda62338b394ec41655679b2d ARG TEMPEST_HORIZON_TAG=0.2.0 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 && \ - sed -i -E /^kubernetes==+.*$/d upper-constraints.txt && \ - sed -i -E /^ujson==+.*$/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 && \ - sed -i -E /#egg=tempest/d upper-constraints.opnfv.txt && \ - sed -i -E /#egg=rally/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 \ + 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 \ - upper-constraints.txt upper-constraints.opnfv.txt && \ + rm -r /src/odl_test/.git /src/tempest-horizon/ thirdparty-requirements.txt && \ apk del .build-deps COPY testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] |