diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-07-07 09:51:07 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-07-07 09:51:07 +0200 |
| commit | d02de1afd4be8b765785e75c7c0f884fe54b8e5e (patch) | |
| tree | 4bca87263a8a17db9bb0196a59fe8e819d7a5bbc | |
| parent | 68b2a9ac43003840ae0b88bf3b2cd6c1fc10db21 (diff) | |
Remove distlib from OpenStack constraints
It raised side effects wih Alpine [1].
[1] https://build.opnfv.org/ci/job/functest-kubernetes-core-docker-build-amd64-master/126/console
Change-Id: If52bff670c7646e7cdc6703a6ed397a23a2be2b9
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | docker/core/Dockerfile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 0d461e3d..123f866d 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -9,13 +9,18 @@ COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.T RUN apk --no-cache add --update python3 py3-pip bash git grep libffi openssl mailcap && \ apk --no-cache add --virtual .build-deps --update \ python3-dev build-base libffi-dev openssl-dev && \ + git init /src/requirements && \ + (cd /src/requirements && \ + git fetch --tags https://review.opendev.org/openstack/requirements $OPENSTACK_TAG && \ + git checkout FETCH_HEAD) && \ + sed -i -E /^distlib==+.*$/d /src/requirements/upper-constraints.txt && \ git init /src/functest-kubernetes && \ (cd /src/functest-kubernetes && \ git fetch --tags https://gerrit.opnfv.org/gerrit/functest-kubernetes $BRANCH && \ git checkout FETCH_HEAD) && \ pip3 install --no-cache-dir --src /src \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \ - -chttps://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt \ + -c/src/requirements/upper-constraints.txt \ /src/functest-kubernetes && \ (cd /src/rally && patch -p1 < /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch) && \ (cd /usr/lib/python3.8/site-packages/xrally_kubernetes/ && \ @@ -26,7 +31,7 @@ RUN apk --no-cache add --update python3 py3-pip bash git grep libffi openssl mai mkdir -p /etc/rally && \ printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \ mkdir -p /var/lib/rally/database && rally db create && \ - rm /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch && \ + rm -r /src/requirements/.git /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch && \ apk del .build-deps COPY logging.ini /usr/lib/python3.8/site-packages/xtesting/ci/logging.ini COPY logging.debug.ini /usr/lib/python3.8/site-packages/xtesting/ci/logging.debug.ini |