aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-11-22 01:08:39 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2020-11-22 01:12:24 +0100
commite0f099e4054426206193bcdbc9a40d57d5035897 (patch)
treed482d84a7aee8079cda2a651975903d41c75ebfe /docker
parent44ec2d234c57c77ebb534791ac3963355406f8ed (diff)
Patch xrally_kubernetes for kubernetes 12
Then it reverts "xrally_kubernetes fails vs kubernetes 12.0". https://github.com/collivier/xrally-kubernetes/commit/10cd8fc1611d8b954532617f75cc90a0277b717e Change-Id: I3a0beef0b0e6322d3a871a2a90a1c0570ed70a4d Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/core/Dockerfile1
1 files changed, 0 insertions, 1 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index b43dd7082..80be9ee3d 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -22,7 +22,6 @@ RUN apk --no-cache add --update \
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 /^kubernetes==+.*$/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 \