public inbox for buildbot@sourceware.org
 help / color / mirror / Atom feed
From: Simon Chopin <simon.chopin@canonical.com>
To: buildbot@sourceware.org
Cc: Simon Chopin <simon.chopin@canonical.com>
Subject: [PATCH] Enable glibc builds on stable release branches
Date: Mon, 17 Apr 2023 13:06:19 +0200	[thread overview]
Message-ID: <CAOOWow01De4uFbKW9Db-OXXk-YW=EkFZARL0w4z-kK1eeT0s7A@mail.gmail.com> (raw)

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

             reply	other threads:[~2023-04-17 11:06 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-17 11:06 Simon Chopin [this message]
2023-04-17 12:55 ` Mark Wielaard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAOOWow01De4uFbKW9Db-OXXk-YW=EkFZARL0w4z-kK1eeT0s7A@mail.gmail.com' \
    --to=simon.chopin@canonical.com \
    --cc=buildbot@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).