From 8ca99d45e57aa1bb91c6b536af5f0bea382a6ba7 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 21 Jan 2021 16:52:50 +0100 Subject: Follow new pip name resolver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib185c90b4403a25db55ab0948c2d6bb2b2bc8dfd Signed-off-by: Cédric Ollivier --- docker/smoke/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docker/smoke/Dockerfile') diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index a7c633e51..1e083d3c9 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -20,7 +20,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \ python3-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev libxml2-dev libxslt-dev && \ case $(uname -m) in aarch*|arm*) CFLAGS="-O0" \ - pip3 install --no-cache-dir -c/src/requirements/upper-constraints.txt \ + pip3 install --use-deprecated=legacy-resolver --no-cache-dir -c/src/requirements/upper-constraints.txt \ -c/src/functest/upper-constraints.txt lxml && \ sed -i -E /^numpy=/d /src/requirements/upper-constraints.txt && apk add py3-numpy ;; esac && \ git init /src/patrole && \ @@ -68,14 +68,14 @@ RUN apk --no-cache add --update libxml2 libxslt && \ git fetch --tags https://opendev.org/openstack/cyborg-tempest-plugin.git $CYBORG_TEMPEST_TAG && \ git checkout FETCH_HEAD) && \ update-requirements -s --source /src/requirements /src/cyborg-tempest-plugin && \ - pip3 install --no-cache-dir --src /src -c/src/requirements/upper-constraints.txt \ + pip3 install --use-deprecated=legacy-resolver --no-cache-dir --src /src -c/src/requirements/upper-constraints.txt \ -c/src/functest/upper-constraints.txt \ /src/patrole /src/barbican-tempest-plugin /src/neutron-tempest-plugin \ /src/cinder-tempest-plugin /src/keystone-tempest-plugin \ /src/octavia-tempest-plugin /src/heat-tempest-plugin /src/telemetry-tempest-plugin \ /src/cyborg-tempest-plugin && \ mkdir -p /home/opnfv/functest/data/refstack && \ - pip3 install --no-cache-dir --src /src -c/src/requirements/upper-constraints.txt \ + pip3 install --use-deprecated=legacy-resolver --no-cache-dir --src /src -c/src/requirements/upper-constraints.txt \ -c/src/functest/upper-constraints.txt \ git+https://opendev.org/openstack/neutron.git@$NEUTRON_TAG#egg=neutron \ git+https://opendev.org/openstack/glance.git@$GLANCE_TAG#egg=glance \ -- cgit