Skip to content

Commit a30ce4c

Browse files
committed
Fix compatibility with Rally 5.1.0
Also, bumps a min rally requirement to 5.1.0 Change-Id: Ida53c137997a58589cbae70af02c95a731845de1 Signed-off-by: Andriy Kurilin <andr.kurilin@gmail.com>
1 parent 9b81fdb commit a30ce4c

8 files changed

Lines changed: 24 additions & 18 deletions

File tree

CHANGELOG.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ Changed
6868
Dict-style access (``credential["auth_url"]``) is kept for backward
6969
compatibility.
7070

71+
* Bump minimal required version to Rally 5.1.0. Switch docker image to use it.
72+
7173
Deprecated
7274
~~~~~~~~~~
7375

@@ -93,6 +95,11 @@ Fixed
9395
worked; it does now, so long-running workloads no longer risk a reused token
9496
expiring in the middle of a measured action.
9597

98+
* The certification task (``tasks/openstack/task.yaml``) passed an empty
99+
``image_location`` to the Glance scenarios when ``glance_image_location`` was
100+
set to an empty string (as ``task_arguments.yaml`` does) instead of falling
101+
back to the default image url.
102+
96103
[4.1.0] - 2026-07-23
97104
--------------------
98105

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM xrally/xrally:5.0.0
1+
FROM xrally/xrally:5.1.0
22

33
# "rally" user (which is selected by-default) is owner of "/rally" directory,
44
# so there is no need to call chown or switch the user

pyproject.toml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,6 @@ no_warn_no_return = true
159159
module = "tests.*"
160160
ignore_errors = true
161161

162-
# temporary rally disable. wating for a new release
163-
[[tool.mypy.overrides]]
164-
module = "rally.*"
165-
ignore_missing_imports = true
166-
167162
[[tool.mypy.overrides]]
168163
module = [
169164
"barbicanclient.*",
@@ -765,7 +760,7 @@ disable_error_code = ["no-untyped-def"]
765760

766761
[[tool.mypy.overrides]]
767762
module = "rally_openstack.task.types"
768-
disable_error_code = ["no-untyped-def", "union-attr"]
763+
disable_error_code = ["no-untyped-def", "union-attr", "override"]
769764

770765
[[tool.mypy.overrides]]
771766
module = "rally_openstack.task.ui.charts.osprofilerchart"

rally_openstack/task/types.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@
3535
class OpenStackResourceType(types.ResourceType):
3636
"""A base class for OpenStack ResourceTypes plugins with help-methods"""
3737

38-
def __init__(self, context=None, cache=None):
39-
super().__init__(context, cache)
38+
def __init__(self, context=None, cache=None, scenario_cls=None):
39+
super().__init__(
40+
context=context, cache=cache, scenario_cls=scenario_cls)
4041

4142
self._clients = None
4243
if self._context.get("admin"):

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
requests!=2.20.0,!=2.24.0 # Apache License, Version 2.0
22

3-
rally>=5.0.0 # Apache License, Version 2.0
3+
rally>=5.1.0 # Apache License, Version 2.0
44
pbr!=2.1.0 # Apache License, Version 2.0
55

66
# OpenStack related
77
gnocchiclient # Apache Software License
88
keystoneauth1
99
kubernetes # Apache License Version 2.0
10-
openstacksdk # Apache License, Version 2.0
10+
openstacksdk
1111
os-faults>=0.2.0 # Apache Software License
1212
osprofiler # Apache License, Version 2.0
1313
python-barbicanclient # Apache Software License

tasks/openstack/task.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
{%- set glance_image_location = glance_image_location|default("https://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img") %}
2+
{%- set glance_image_location = glance_image_location|default("https://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img", true) %}
33
{%- set image_name = image_name|default("^(cirros.*-disk|TestVM)$") %}
44
{%- set flavor_name = flavor_name|default("m1.tiny") %}
55
{%- set use_existing_users = use_existing_users|default(false) %}

tests/ci/playbooks/roles/process-task-results-multiple-runs/tasks/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
- name: Make a trends report
2828
become: true
2929
become_user: stack
30-
command: rally task trends --tasks {{ task_uuids.stdout }} --out {{ rally_results_dir }}/trends.html
30+
command: rally task trends {{ task_uuids.stdout }} --out {{ rally_results_dir }}/trends.html
3131

3232
- name: Make a JUnit report
3333
become: true

upper-constraints.txt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ aiohappyeyeballs===2.6.2
22
aiohttp===3.14.1
33
aiosignal===1.4.0
44
alembic===1.18.5
5+
annotated-doc===0.0.5
56
async-timeout===5.0.1
67
attrs===26.1.0
78
autopage===0.6.0
89
backports.strenum===1.3.1
910
bcrypt===5.0.0
10-
certifi===2026.6.17
11+
certifi===2026.7.22
1112
cffi===2.0.0
1213
charset-normalizer===3.4.7
1314
click===8.4.2
@@ -71,7 +72,7 @@ PyNaCl===1.6.2
7172
pyOpenSSL===24.2.1
7273
pyparsing===3.3.2
7374
pyperclip===1.11.0
74-
python-barbicanclient===7.4.0
75+
python-barbicanclient===7.5.0
7576
python-cinderclient===9.9.0
7677
python-dateutil===2.9.0.post0
7778
python-designateclient===7.0.0
@@ -83,7 +84,7 @@ python-keystoneclient===5.8.0
8384
python-magnumclient===4.11.0
8485
python-manilaclient===6.2.0
8586
python-mistralclient===6.2.0
86-
python-neutronclient===12.0.0
87+
python-neutronclient===13.0.0
8788
python-novaclient===18.13.0
8889
python-octaviaclient===3.14.0
8990
python-openstackclient===10.0.0
@@ -93,22 +94,24 @@ python-troveclient===8.10.0
9394
python-watcherclient===4.10.0
9495
python-zaqarclient===4.5.0
9596
PyYAML===6.0.3
96-
rally===5.0.1
97+
rally===5.1.0
9798
referencing===0.37.0
9899
requests===2.34.2
99100
requests-oauthlib===2.0.0
100101
rfc3986===2.0.0
101102
rich===15.0.0
102103
rich-argparse===1.8.0
103104
rpds-py===0.30.0
104-
setuptools===82.0.1
105+
setuptools===84.0.0
106+
shellingham===1.5.4
105107
six===1.17.0
106108
SQLAlchemy===2.0.51
107109
stevedore===5.8.0
108110
testresources===2.1.2
109111
testscenarios===0.6.2
110112
testtools===2.9.1
111113
tomli===2.4.1
114+
typer===0.27.1
112115
typing_extensions===4.15.0
113116
ujson===5.13.0
114117
urllib3===2.7.0

0 commit comments

Comments
 (0)