diff options
author | 2021-05-11 18:36:05 +0200 | |
---|---|---|
committer | 2021-05-11 18:36:05 +0200 | |
commit | d9720c02d5f6c2168db6a125b36ab8663745a1e3 (patch) | |
tree | cc4a27e4021d7eea669117fc7a701483c696ccba /docker | |
parent | 0a5473ad253dc919676abfd5baed2a169f412cf8 (diff) |
Add --use-deprecated=legacy-resolver in pip calls
Change-Id: I4e0de592e07317d553d3f508c2f30d6ce66c354f
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
-rw-r--r-- | docker/benchmarking/Dockerfile | 4 | ||||
-rw-r--r-- | docker/core/Dockerfile | 4 | ||||
-rw-r--r-- | docker/healthcheck/Dockerfile | 2 | ||||
-rw-r--r-- | docker/smoke/Dockerfile | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index 9e8493386..ff3c9d159 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -8,14 +8,14 @@ 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 ;; esac && \ git init /src/vmtp && \ (cd /src/vmtp && \ git fetch --tags https://review.opendev.org/x/vmtp.git $VMTP_TAG && \ git checkout FETCH_HEAD) && \ update-requirements -s --source /src/requirements /src/vmtp/ && \ - 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/vmtp && \ mkdir -p /home/opnfv/functest/data/rally/neutron/rally-jobs && \ diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 3d6198fa3..94a1482fc 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -25,10 +25,10 @@ RUN apk -U upgrade && \ sed -i -E /^neutron==+.*$/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 --no-cache-dir --src /src -c/src/functest/upper-constraints.txt -c/src/requirements/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 \ -e /src/requirements && \ update-requirements -s --source /src/requirements /src/functest && \ - pip3 install --no-cache-dir --src /src -c/src/functest/upper-constraints.txt -c/src/requirements/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 \ -e /src/functest && \ (cd /src/rally && patch -p1 < /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch) && \ sed -i -E /#egg=rally/d /src/functest/upper-constraints.txt && \ diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index f20412efb..ee97794f7 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -11,7 +11,7 @@ RUN apk --no-cache add --virtual .build-deps --update \ git fetch --tags https://opendev.org/openstack/tempest-horizon.git $TEMPEST_HORIZON_TAG && \ git checkout FETCH_HEAD) && \ update-requirements -s --source /src/requirements /src/tempest-horizon/ && \ - 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/tempest-horizon -rthirdparty-requirements.txt && \ git init /src/odl_test && \ diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index cd6b922d7..ce5796f21 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -17,7 +17,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 ;; esac && \ git init /src/patrole && \ (cd /src/patrole && \ @@ -64,7 +64,7 @@ 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 \ @@ -73,7 +73,7 @@ RUN apk --no-cache add --update libxml2 libxslt && \ mkdir -p /home/opnfv/functest/data/refstack && \ mkdir -p /etc/neutron /etc/glance && \ virtualenv --no-pip --no-setuptools --no-wheel oslo && . oslo/bin/activate && \ - 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 \ oslo.policy -e git+https://opendev.org/openstack/neutron.git@$NEUTRON_TAG#egg=neutron \ -e git+https://opendev.org/openstack/glance.git@$GLANCE_TAG#egg=glance && \ |