From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Fri, 28 Jan 2022 12:55:48 +0000 (+0100)
Subject: Update rally-openstack to latest crucial changes
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=dba0af1be3857a639d5ebd56a534b8127f504afb;p=functest.git

Update rally-openstack to latest crucial changes

It fixes cinder "update_volume_type() got an unexpected keyword and
the bugs detected by CI (here Cinder v3)
Then it also reverts:
 - Temporarily remove CinderVolumeTypes.create_and_update_volume_type
 - Temporarily blacklist CinderVolumeTypes.create_volume_type_add_and_list_type_access

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

diff --git a/upper-constraints.txt b/upper-constraints.txt
index 94371b9d0..4a153a561 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -10,8 +10,8 @@ git+https://github.com/PyCQA/bandit@3d0824676974e7e2e9635c10bc4f12e261f1dbdf#egg
 bandit===1.1.0
 ruamel.yaml.jinja2==0.2.2
 -e git+https://opendev.org/openstack/tempest@cfddd400ce403bc6fb3740c0722eebd021f8b11c#egg=tempest
--e git+https://opendev.org/openstack/rally.git@3.1.0#egg=rally
-git+https://opendev.org/openstack/rally-openstack.git@2.1.0#egg=rally-openstack
+-e git+https://opendev.org/openstack/rally.git@3.3.0#egg=rally
+git+https://opendev.org/openstack/rally-openstack.git@1c470d56f4dd63374f41f7b243092b0a0751a22f#egg=rally-openstack
 git+https://github.com/xrally/xrally-kubernetes.git@e4c605fa0ae0cae63ce5ac19ce8516f0bdd5e868#egg=xrally-kubernetes
 pylint===1.9.5;python_version=='2.7'
 pylint===2.4.4;python_version=='3.8'