From 44ec2d234c57c77ebb534791ac3963355406f8ed Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 20 Nov 2020 11:44:23 +0100 Subject: xrally_kubernetes fails vs kubernetes 12.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It selects Kubernetes 11.0 as opposed to the new OpenStack upper-constraints.txt [1]. Once xrally_kubernetes is updated, this patch will be removed. [1] https://github.com/openstack/requirements/commit/d8d2e848ec057c47963d33dbd44479fc28e6f38b Change-Id: I486284a2e67a732048755551a54234852ae3e45f Signed-off-by: Cédric Ollivier --- docker/core/Dockerfile | 1 + 1 file changed, 1 insertion(+) (limited to 'docker/core') diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 80be9ee3d..b43dd7082 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -22,6 +22,7 @@ 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 \ -- cgit