diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-11-20 11:44:23 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-11-20 11:46:24 +0100 |
| commit | 44ec2d234c57c77ebb534791ac3963355406f8ed (patch) | |
| tree | 45d90c02247deed5784ea3899263e7266f428db2 | |
| parent | bbad4b86cfcbe87b4dc5a3c57cb9f0a747a92f1c (diff) | |
xrally_kubernetes fails vs kubernetes 12.0
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 <cedric.ollivier@orange.com>
| -rw-r--r-- | docker/core/Dockerfile | 1 | ||||
| -rw-r--r-- | upper-constraints.txt | 1 |
2 files changed, 2 insertions, 0 deletions
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 \ diff --git a/upper-constraints.txt b/upper-constraints.txt index 420d93ba0..e9b183286 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -23,6 +23,7 @@ ruamel.yaml.jinja2==0.2.2 -e git+https://opendev.org/openstack/rally.git#egg=rally git+https://opendev.org/openstack/rally-openstack.git#egg=rally-openstack git+https://github.com/xrally/xrally-kubernetes.git#egg=xrally-kubernetes +kubernetes===11.0.0 pylint===1.9.5;python_version=='2.7' pylint===2.4.4;python_version=='3.8' flake8===3.7.9 |