Skip to content

Close #390: Ignore !buildbot comment if no builder matches #400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 21, 2023
Merged

Close #390: Ignore !buildbot comment if no builder matches #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions master/custom/pr_testing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,20 @@ def handle_issue_comment(self, payload, event):
return ([], "git")

builder_filter_fn = re.compile(builder_filter)
matched_builders = [
builder
for builder in self.builder_names
if builder_filter_fn.search(builder)
]
if not matched_builders:
log.msg(f"GitHub PR #{number}: regex {builder_filter!r} "
f"did not match any builder", logLevel=logging.DEBUG)
yield self._post_comment(
payload["issue"]["comments_url"],
"The regex {builder_filter!r} did not match any buildbot builder",
)
return (changes, "git")

yield self._post_comment(
payload["issue"]["comments_url"],
BUILD_COMMAND_SCHEDULED_MESSAGE.format(
Expand All @@ -264,8 +278,7 @@ def handle_issue_comment(self, payload, event):
builders="\n".join(
{
f"- `{builder}`"
for builder in self.builder_names
if builder_filter_fn.match(builder)
for builder in matched_builders
}
),
),
Expand Down
4 changes: 2 additions & 2 deletions master/custom/schedulers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ def addBuildsetForChanges(self, **kwargs):
builder_names = [
builder_name
for builder_name in builder_names
if matcher.match(builder_name)
if matcher.search(builder_name)
]
log.msg("Bulder names filtered: {}".format(builder_names))
log.msg(f"Builder names filtered: {builder_names}")
kwargs.update(builderNames=builder_names)
yield super().addBuildsetForChanges(**kwargs)
return
Expand Down