[PATCH] Enable glibc builds on stable release branches

[PATCH] Enable glibc builds on stable release branches

[Simon Chopin]

The glibc 2.37 release announcement contains an exlicit call for
distributions to track the stable release branches. In light of this, I
think it makes sense for those branches to have CI coverage similar to
the master branch.

Signed-off-by: Simon Chopin <simon.chopin@canonical.com>
---
 builder/master.cfg | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/builder/master.cfg b/builder/master.cfg
index 7564f58..01b8ad8 100644
--- a/builder/master.cfg
+++ b/builder/master.cfg
@@ -349,6 +349,9 @@ def master_and_users_try_branches(ref):
     return True
   return False

+def master_and_stable_branches(ref):
+  return ref == "refs/heads/master" or
re.match("refs/heads/release/[.0-9]+/master", ref)
+
 sourceware_repourl='https://sourceware.org/git/builder.git'
 sourceware_gitpoller = changes.GitPoller(repourl=sourceware_repourl,
                                          branches=['main'],
@@ -444,7 +447,7 @@ c['change_source'].append(gcc_gitpoller)

 glibc_repourl='https://sourceware.org/git/glibc.git'
 glibc_gitpoller = changes.GitPoller(repourl=glibc_repourl,
-                                    branches=['master'],
+                                    branches=master_and_stable_branches,
                                     pollInterval=3*60,
                                     pollRandomDelayMax=2*60,
                                     project='glibc')
@@ -945,23 +948,23 @@ gcc_build_scheduler = schedulers.SingleBranchScheduler(
                       "gcc-opensuseleap-x86_64"])
 c['schedulers'].append(gcc_build_scheduler)

-glibc_scheduler = schedulers.SingleBranchScheduler(
+glibc_scheduler = schedulers.AnyBranchScheduler(
         name="glibc",
         change_filter=util.ChangeFilter(project="glibc",
-                                        branch="master"),
+
branch_re="^(release/[.0-9]+/)?master$"),
         treeStableTimer=10*60,
-        reason="glibc project master branch update",
+        reason="glibc project release branch update",
         builderNames=["glibc-fedrawhide-x86_64",
                       "glibc-fedora-x86_64",
                       "glibc-fedora-arm64"])
 c['schedulers'].append(glibc_scheduler)

 # Quick build only scheduler
-glibc_build_scheduler = schedulers.SingleBranchScheduler(
+glibc_build_scheduler = schedulers.AnyBranchScheduler(
         name="glibc-build",
         change_filter=util.ChangeFilter(project="glibc",
-                                        branch="master"),
-        reason="glibc project master branch update",
+
branch_re="^(release/[.0-9]+/)?master$"),
+        reason="glibc project release branch update",
         builderNames=["glibc-debian-i386",
                       "glibc-rawhide-x86_64",
                       "glibc-debian-testing-x86_64",

base-commit: 34dc5aee0c63f54ce670658adb59085eae5ea7e1
-- 
2.37.2

Re: [PATCH] Enable glibc builds on stable release branches

[Mark Wielaard]

Hi Simon,

On Mon, 2023-04-17 at 13:06 +0200, Simon Chopin wrote:
> The glibc 2.37 release announcement contains an exlicit call for
> distributions to track the stable release branches. In light of this, I
> think it makes sense for those branches to have CI coverage similar to
> the master branch.

Makes sense and looks good. Pushed.

Thanks,

Mark

P.S. It did have some odd whitespace issues, easily resolved, but you
might want to look at why your mailer wraps lines.