Skip to content

Commit

Permalink
Sort all items in the tarball stats report (#2637)
Browse files Browse the repository at this point in the history
* Sort _all_ items in the tarball stats report to ensure that the testing is deterministic
* Add rev-lock on humanize for jinja2-humanize-extension
* Update the gold file
  • Loading branch information
webbnh authored Feb 24, 2022
1 parent 1bae994 commit e0515fb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions server/bin/gold/test-5.2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -356,13 +356,13 @@ Summary Statistics for Tar Balls on 1970-01-01 (external data only):
1.8 kB size

By Server Origin:
5 main pbench server
3 "ONE" pbench satellite server
5 main pbench server

Controller Counts:
6 controllers
3 main pbench server
3 "ONE" pbench satellite server
3 main pbench server

Tar Ball Counts broken down by weeks for most recent 2 months (with satellite percentages):

Expand Down
4 changes: 2 additions & 2 deletions server/bin/pbench-tarball-stats.py
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,13 @@ def transform_buckets(buckets: dict, sat_names: list, now: datetime, kind: str):
{{ "{:>18s}".format(good.size|humanize_naturalsize) }} size
By Server Origin:
{% for name, value in server_origin.items() %}
{% for name, value in server_origin.items()|sort %}
{{ "{:18n}".format(value) }} {% if name == "main" %}{{ name }} pbench server{% else %}"{{ name }}" pbench satellite server{% endif +%}
{% endfor %}
Controller Counts:
{{ "{:18n}".format(good.ctrls.keys()|length) }} controllers
{% for name, value in satellites.items() %}
{% for name, value in satellites.items()|sort %}
{{ "{:18n}".format(value) }} {% if name == "main" %}{{ name }} pbench server{% else %}"{{ name }}" pbench satellite server{% endif +%}
{% endfor %}
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion server/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
boto3
elasticsearch1
humanize>=3.11
humanize>=3.11, <4.0.0
jinja2>=3.0
jinja2-humanize-extension

0 comments on commit e0515fb

Please sign in to comment.