From: Cédric Ollivier Date: Sun, 13 Jun 2021 08:56:48 +0000 (+0200) Subject: Remove neutron from OpenStack upper-contraints X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F80%2F72680%2F1;p=functest.git Remove neutron from OpenStack upper-contraints Else it would fail as both the form of a package name and a version specifier conflict. https://build.opnfv.org/ci/job/functest-opnfv-functest-smoke-wallaby-build/13/console Change-Id: I09d80d2a07ccd692ac1b0509c7e14f317b5248df Signed-off-by: Cédric Ollivier --- diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 70586b4e3..7ba6de3bf 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -23,6 +23,7 @@ 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 /^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 --use-deprecated=legacy-resolver --no-cache-dir --src /src -c/src/functest/upper-constraints.txt -c/src/requirements/upper-constraints.txt \