From 8c16155c27f5bbfedd7ab79082577a7e60dd26a0 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Thu, 26 Sep 2024 12:33:26 +0200 Subject: [PATCH 1/2] master.cfg: Rework gerrit change filter - Switch to property_eq and property_not_eq where possible. - Add filter for status!="MERGED". Due to our merge process we always get an updated patch on merge. But buildbot already builds that change through the release branch builds. No need to build via gerrit as well. Signed-off-by: Frank Lichtenheld --- buildbot-host/buildmaster/master.cfg | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/buildbot-host/buildmaster/master.cfg b/buildbot-host/buildmaster/master.cfg index 0231057..74771fd 100755 --- a/buildbot-host/buildmaster/master.cfg +++ b/buildbot-host/buildmaster/master.cfg @@ -820,19 +820,6 @@ openvpn_file_patterns = [ openvpn_filter_fn = "^(" + "|".join(openvpn_file_patterns) + ")$" -def gerrit_filter(branch_name): - def filter_func(c): - ret = ( - c.properties.getProperty("event.patchSet.uploader.name") - in verified_authors_list - and (c.properties.getProperty("target_branch") == branch_name) - and any([re.search(openvpn_filter_fn, f) for f in c.files]) - ) - return ret - - return filter_func - - openvpn_branches = {"main": openvpn_main_branch, "release": openvpn_release_branch} for branch_type, branch_name in openvpn_branches.items(): # Ensure that in OpenVPN 2 we run smoke tests first and only if those pass run @@ -857,9 +844,16 @@ for branch_type, branch_name in openvpn_branches.items(): openvpn_gerrit_smoketest_scheduler = schedulers.SingleBranchScheduler( name=f"openvpn-gerrit-smoketest-{branch_type}", change_filter=util.ChangeFilter( - filter_fn=gerrit_filter(branch_name), repository_re=".*gerrit.*", project="openvpn", + filter_fn=lambda c: any([re.search(openvpn_filter_fn, f) for f in c.files]), + property_eq={ + "event.patchSet.uploader.name": verified_authors_list, + "target_branch": branch_name, + }, + property_not_eq={ + "event.change.status": "MERGED", + }, ), treeStableTimer=openvpn_tree_stable_timer, builderNames=builder_names["openvpn-smoketest"], From 1fdc5b46318003ff1020ea5ce51f2e6358fd8f49 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Thu, 26 Sep 2024 12:37:15 +0200 Subject: [PATCH 2/2] master.cfg: Set higher priority for Gerrit smoketest builds Since these block all other workers it is useful to get them out of the way early. Also gives faster feedback to developers. Signed-off-by: Frank Lichtenheld --- buildbot-host/buildmaster/master.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/buildbot-host/buildmaster/master.cfg b/buildbot-host/buildmaster/master.cfg index 74771fd..fd56c7c 100755 --- a/buildbot-host/buildmaster/master.cfg +++ b/buildbot-host/buildmaster/master.cfg @@ -855,6 +855,7 @@ for branch_type, branch_name in openvpn_branches.items(): "event.change.status": "MERGED", }, ), + priority=1, treeStableTimer=openvpn_tree_stable_timer, builderNames=builder_names["openvpn-smoketest"], )