commit 3f5f26b63b9b796466a50a6ea68edb2163066589
parent 5600ee4f63153035f18b2be0732049b7d89ad497
Author: Christian Grothoff <christian@grothoff.org>
Date: Tue, 24 Dec 2019 00:46:12 +0100
fix launch rule for site-builder
Diffstat:
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -120,20 +120,6 @@ c["change_source"] = [ALLCS]
# Configure the Schedulers, which decide how to react to incoming
# changes.
-# The web page changed if 'www' changed OR if 'web' in the 'twister' repo changed:
-def twister_web_page(change):
- _change = change.asDict()
- repo = _change.get("project")
- if repo in ["www"]:
- return True
-
- files = _change.get("files")
- for file in files:
- if re.search(r"web", file.get("name", "")) \
- and "twister" == repo:
- return True
- return False
-
# Jobs we run at 6am every day: coverage analysis and auditor.
NIGHTLY_SCHEDULER = schedulers.Nightly(
name="nightly-scheduler",
@@ -155,15 +141,27 @@ DOC_SCHEDULER = schedulers.SingleBranchScheduler(
treeStableTimer=None
)
-# Sites are re-build whenever deployment, www or twister changes.
+
+# The web page changed if 'www' changed OR if 'web' in the 'twister' repo changed:
+def twister_web_page(change):
+ _change = change.asDict()
+ repo = _change.get("project")
+ if repo in ["www", "buywith", "deployment"]:
+ return True
+
+ files = _change.get("files")
+ for file in files:
+ if re.search(r"web", file.get("name", "")) \
+ and "twister" == repo:
+ return True
+ return False
+
+# Sites are re-build whenever deployment, www buywith, or twister changes.
SITES_SCHEDULER = schedulers.SingleBranchScheduler(
name="sites-scheduler",
builderNames=["sites-builder"],
change_filter=util.ChangeFilter(
branch_re="(master|stable)",
- # Given that filter_fn is used, the line below could be
- # removed (?)
- project_re="(www|twister|deployment|buywith)",
filter_fn=twister_web_page
),
treeStableTimer=None