aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2021-06-13 10:56:48 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2021-06-13 10:57:51 +0200
commit367ed5a277c9ad0eeee2537b4d20f260331439b3 (patch)
treec6fc6edb919970dd10ec132fa53b0ddd083d6652 /docker
parent70d497360d0f49540ce2ac694d6d72a3e9e175c0 (diff)
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 <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/core/Dockerfile1
1 files changed, 1 insertions, 0 deletions
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 \