Re-enable xrally_kubernetes master

It mostly reverts the following changes as xrally_kubernetes supports 12.0.0
- xrally_kubernetes fails vs kubernetes 12.0
- patch xrally_kubernetes for kubernetes 12"

https://github.com/xrally/xrally-kubernetes/commit/2ffa85af2bff3438b6b23034b6ec6ee1de481090

Change-Id: I38a6e3fba35ec2afabd7c849a0cde74d83eece1e
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/upper-constraints.txt b/upper-constraints.txt
index b673336..420d93b 100644 (file)
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -22,7 +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/collivier/xrally-kubernetes.git#egg=xrally-kubernetes
+git+https://github.com/xrally/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