From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Thu, 27 Oct 2022 13:22:47 +0000 (+0200)
Subject: Stop install distlib via packages
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7d27247c1f48ac7b371bfca726b613257d1974df;p=functest.git

Stop install distlib via packages

Change-Id: I2a98204da9875186be648c120474834216fffe93
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index cf64d48e7..c4d8de309 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -14,8 +14,6 @@ RUN apk -U upgrade && \
         python3-dev build-base linux-headers libffi-dev \
         openssl-dev libjpeg-turbo-dev rust cargo \
         libxml2-dev libxslt-dev && \
-    apk --no-cache add --update py3-distlib\>=0.3.1 \
-        --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main && \
     git init /src/requirements && \
     (cd /src/requirements && \
         git fetch --tags https://review.opendev.org/openstack/requirements $OPENSTACK_TAG && \
@@ -25,7 +23,6 @@ RUN apk -U upgrade && \
         git fetch --tags https://gerrit.opnfv.org/gerrit/functest $BRANCH && \
         git checkout FETCH_HEAD) && \
     sed -i -E /^tempest==+.*$/d /src/requirements/upper-constraints.txt && \
-    sed -i -E /^distlib=/d /src/requirements/upper-constraints.txt && \
     case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d /src/requirements/upper-constraints.txt && apk add --no-cache py3-pynacl ;; esac && \
     sed -i -E /#egg=functest/d /src/functest/upper-constraints.txt && \
     pip3 install --use-deprecated=legacy-resolver --no-cache-dir --src /src -c/src/functest/upper-constraints.txt -c/src/requirements/upper-constraints.txt \