commit: 457eadb511be7e44744cfa4a91a302614b5d754f
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 30 22:43:32 2022 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 22:43:32 2022 +0000
URL:
https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=457eadb5
Add scheduler_update_db_mr for mr/pr support
Signed-off-by: Magnus Granberg <zorry <AT> gentoo.org>
buildbot_gentoo_ci/config/schedulers.py | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/buildbot_gentoo_ci/config/schedulers.py
b/buildbot_gentoo_ci/config/schedulers.py
index 2e5379c..b769f00 100644
--- a/buildbot_gentoo_ci/config/schedulers.py
+++ b/buildbot_gentoo_ci/config/schedulers.py
@@ -39,8 +39,15 @@ def getGitChanges(props):
change_data['revision'] = k['revision']
change_data['timestamp'] = k['when_timestamp']
change_data['branch'] = k['branch']
+ change_data['project'] = k['project']
return change_data
+def mr_branch_fn(branch):
+ # if branch end with -mr or -pr
+ if branch[-3] == '-mr' or branch[-3] == '-pr':
+ return True
+ return False
+
def gentoo_schedulers():
scheduler_update_db = schedulers.SingleBranchScheduler(
name='scheduler_update_db',
@@ -49,7 +56,16 @@ def gentoo_schedulers():
change_data = getGitChanges
),
builderNames = builderUpdateDbNames,
- change_filter=util.ChangeFilter(branch='master'),
+ change_filter=util.ChangeFilter(branch='master', category='push'),
+ )
+ scheduler_update_db_mr= schedulers.SingleBranchScheduler(
+ name='scheduler_update_db_mr',
+ treeStableTimer=0,
+ properties = dict(
+ change_data = getGitChanges
+ ),
+ builderNames = builderUpdateDbNames,
+ change_filter=util.ChangeFilter(branch_fn=mr_branch_fn,
category='merge_request'),
)
create_stage4 = schedulers.ForceScheduler(
name="create_stage4",
@@ -86,6 +102,7 @@ def gentoo_schedulers():
s = []
s.append(create_stage4)
s.append(scheduler_update_db)
+ s.append(scheduler_update_db_mr)
s.append(update_repo_check)
s.append(update_cpv_data)
s.append(update_v_data)
