Skip to content

Commit 37f76d3

Browse files
committed
Merge PR ceph#65555 into main
* refs/pull/65555/head: script/redmine-upkeep: include each issue changed in summary .github/workflows/redmine-upkeep: use smaller limit for testing push Reviewed-by: Ernesto Puerta <[email protected]>
2 parents c454342 + b97835c commit 37f76d3

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

.github/workflows/redmine-upkeep.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
python3 ceph/src/script/redmine-upkeep.py
9393
--github-action
9494
--git-dir=./ceph/
95-
--limit=5000
95+
--limit=50
9696
env:
9797
REDMINE_API_KEY: ${{ secrets.REDMINE_API_KEY_BACKPORT_BOT }}
9898
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

src/script/redmine-upkeep.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,8 +1118,7 @@ def _process_issue_transformations(self, issue):
11181118
issue_update.logger.info("Successfully updated Redmine issue.")
11191119
self.issues_modified += 1
11201120
for t_name in applied_transformations:
1121-
self.modifications_made.setdefault(t_name, 0)
1122-
self.modifications_made[t_name] += 1
1121+
self.modifications_made.setdefault(t_name, set()).add(issue.id)
11231122
return True
11241123
except requests.exceptions.HTTPError as e:
11251124
issue_update.logger.error("API PUT failure during upkeep.", exc_info=True)
@@ -1483,7 +1482,12 @@ def main():
14831482
if RU:
14841483
log.info(f"Summary: Issues Inspected: {RU.issues_inspected}, Issues Modified: {RU.issues_modified}, Issues Failed: {RU.upkeep_failures}")
14851484
if RU.issues_modified > 0:
1486-
log.info(f"Modifications by Transformation: {RU.modifications_made}")
1485+
log.info("Modifications by Transformation:")
1486+
for transform, issues in sorted(RU.modifications_made.items()):
1487+
transform_name = transform.removeprefix('_transform_')
1488+
log.info(f" - {transform_name}: {len(issues)} issues")
1489+
for issue in issues:
1490+
log.debug(f" + {REDMINE_ENDPOINT}/issues/{issue}")
14871491
if RedmineUpkeep.GITHUB_RATE_LIMITED:
14881492
log.warning("GitHub API rate limit was encountered during execution.")
14891493

@@ -1502,8 +1506,11 @@ def main():
15021506
f.write(f"- **Warning:** GitHub API rate limit was encountered. Some GitHub-related transformations might have been skipped.\n")
15031507
if RU.issues_modified > 0:
15041508
f.write(f"#### Modifications by Transformation:\n")
1505-
for transform, count in RU.modifications_made.items():
1506-
f.write(f"- `{transform}`: {count} issues\n")
1509+
for transform, issues in sorted(RU.modifications_made.items()):
1510+
transform_name = transform.removeprefix('_transform_')
1511+
f.write(f"- **{transform_name}**\n")
1512+
for issue in issues:
1513+
f.write(f" - [#{issue}]({REDMINE_ENDPOINT}/issues/{issue})\n")
15071514
f.write(f"\n")
15081515

15091516
sys.exit(0)

0 commit comments

Comments
 (0)