python
diff --git a/‎master/custom/schedulers.py
Lines changed: 12 additions & 0 deletions b/‎master/custom/schedulers.py
Lines changed: 12 additions & 0 deletions
diff --git a/‎master/master.cfg
Lines changed: 6 additions & 9 deletions b/‎master/master.cfg
Lines changed: 6 additions & 9 deletions
@@ -5,6 +5,10 @@
 
 
 class GitHubPrScheduler(AnyBranchScheduler):
+    def __init__(self, *args, stable_builder_names, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.stable_builder_names = stable_builder_names
+
     @defer.inlineCallbacks
     def addBuildsetForChanges(self, **kwargs):
         log.msg("Preapring buildset for PR changes")
@@ -18,8 +22,16 @@ def addBuildsetForChanges(self, **kwargs):
         chdict = yield self.master.db.changes.getChange(changeid)
 
         builder_filter = chdict["properties"].get("builderfilter", None)
+        event = chdict["properties"].get("event", None)
         builder_names = kwargs.get("builderNames", self.builderNames)
         if builder_filter and builder_names:
+            # allow unstable builders only for comment-based trigger
+            if event != "issue_comment":
+                builder_names = [
+                    builder_name
+                    for builder_name in builder_names
+                    if builder_name in self.stable_builder_names
+                ]
             log.msg("Found builder filter: {}".format(builder_filter))
             builder_filter, _ = builder_filter
             matcher = re.compile(builder_filter, re.IGNORECASE)
 
@@ -309,16 +309,12 @@ for name, worker_name, buildfactory, stability, tier in BUILDERS:
     if "Windows7" in name:
         continue
 
-    buildername = name + " " + "PR"
+    buildername = f"{name} PR"
 
-    if stability != STABLE:
-        unstable_pull_request_builders.append(buildername)
-    else:
+    if stability == STABLE:
         stable_pull_request_builders.append(buildername)
-
-
-    if any(pattern in buildername for pattern in NO_NOTIFICATION):
-        continue
+    else:
+        unstable_pull_request_builders.append(buildername)
 
     source = GitHub(repourl=git_url, **GIT_KWDS)
 
@@ -352,7 +348,8 @@ c["schedulers"].append(
         name="pull-request-scheduler",
         change_filter=util.ChangeFilter(filter_fn=should_pr_be_tested),
         treeStableTimer=30,  # seconds
-        builderNames=stable_pull_request_builders,
+        builderNames=stable_pull_request_builders + unstable_pull_request_builders,
+        stable_builder_names=set(stable_pull_request_builders),
     )
 )