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>

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index b43dd70..80be9ee 100644 (file)
--- 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 e9b1832..b673336 100644 (file)
--- 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