diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-11-22 01:08:39 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-11-22 01:12:24 +0100 |
| commit | e0f099e4054426206193bcdbc9a40d57d5035897 (patch) | |
| tree | d482d84a7aee8079cda2a651975903d41c75ebfe | |
| parent | 44ec2d234c57c77ebb534791ac3963355406f8ed (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>
| -rw-r--r-- | docker/core/Dockerfile | 1 | ||||
| -rw-r--r-- | upper-constraints.txt | 3 |
2 files changed, 1 insertions, 3 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 \ diff --git a/upper-constraints.txt b/upper-constraints.txt index e9b183286..b6733366d 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -22,8 +22,7 @@ ruamel.yaml.jinja2==0.2.2 -e git+https://opendev.org/openstack/tempest#egg=tempest -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 +git+https://github.com/collivier/xrally-kubernetes.git#egg=xrally-kubernetes pylint===1.9.5;python_version=='2.7' pylint===2.4.4;python_version=='3.8' flake8===3.7.9 |