Skip to content

GH-419: Follow-up fix to support unstable builders triggering #436

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
Nov 1, 2023
Merged

GH-419: Follow-up fix to support unstable builders triggering #436

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
16 changes: 12 additions & 4 deletions master/custom/schedulers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ def addBuildsetForChanges(self, **kwargs):

builder_filter = chdict["properties"].get("builderfilter", None)
event = chdict["properties"].get("event", None)
if event:
# looks like `("issue_comment", "Change")` for a comment
event, _ = event
builder_names = kwargs.get("builderNames", self.builderNames)
if builder_filter and builder_names:
# allow unstable builders only for comment-based trigger
Expand All @@ -32,17 +35,22 @@ def addBuildsetForChanges(self, **kwargs):
for builder_name in builder_names
if builder_name in self.stable_builder_names
]
log.msg("Found builder filter: {}".format(builder_filter))
log.msg(f"Considering only stable builders: {builder_names}")
# looks like `("<filter regex from comment>", "Change")`
builder_filter, _ = builder_filter
log.msg(f"Found builder filter: {builder_filter}")
matcher = re.compile(builder_filter, re.IGNORECASE)
builder_names = [
builder_name
for builder_name in builder_names
if matcher.search(builder_name)
]
log.msg(f"Builder names filtered: {builder_names}")
kwargs.update(builderNames=builder_names)
yield super().addBuildsetForChanges(**kwargs)
if builder_names:
log.msg(f"Builder names filtered: {builder_names}")
kwargs.update(builderNames=builder_names)
yield super().addBuildsetForChanges(**kwargs)
else:
log.msg(f"No matching builders after filtering - breaking out")
return

log.msg("Scheduling regular non-filtered buildset")
Expand Down