From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by sourceware.org (Postfix) with ESMTPS id 96EAC3857036 for ; Mon, 17 Apr 2023 11:06:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 96EAC3857036 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=canonical.com Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 2980D3F193 for ; Mon, 17 Apr 2023 11:06:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1681729582; bh=sLBw9uCxG0+3wfGwK0yy/sJ+Ee+HQuofKX5SiACyZ5g=; h=From:MIME-Version:Date:Message-ID:Subject:To:Cc:Content-Type; b=OnJ63te3p8rXXjMhKgbVcDLJW2XdR11Uu/Pvcr9QxLE6//vCA3Kvgyphos7rdnFUA NTAqqRd93VU7uNaNjWWaIz/D5TXcdQrPtBw7PleW6OMyQlS2A2wjE2yDteVUUXatEz lWVcK3wwvxUu7dS5JAVCMGFjoIb2r0Og93m0l1cSuKjNEqyPTU+Ci+x41Kg2afaViQ 1GeRJMyNbNNmewkpt872vgvOsKJfVLsR19iyIOZ2ZeNctGbDSv2s030RqR1p5AJSLS hV03jnNfXVL1hcWZagd9zrDGc0ZdD2oG4xkFyw6CV3yx4mFqJ3pDpCm0fn9p3rxPhv Xnqfj7jXjEYkw== Received: by mail-pl1-f199.google.com with SMTP id kr13-20020a170903080d00b001a6e35c6864so1053142plb.19 for ; Mon, 17 Apr 2023 04:06:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681729580; x=1684321580; h=cc:to:subject:message-id:date:mime-version:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=sLBw9uCxG0+3wfGwK0yy/sJ+Ee+HQuofKX5SiACyZ5g=; b=E34M09RKt9SBwnOhr/AVT5zyA5BKIyF5tsHAgs8P+qmyszfoDXNYkxwm7J6jThPfDU fzHc2t/+fe+5153pm+OmApmeukpHA1+5OX6TrXO2Fdx9ds/2DISrcuH7/1EJWeP2M/mi 0KkGVy88pBBmTZhxQIBQ7j37KuUNTVNRQ7HghjIy0yYgxr69zbcCmeub1o3hnO+itnIf HrZsvaEP8TwRetCjL1XKqhnGFKSUQQny8ZRx2BiGEPtvNv2/Lnweq7P0UrVLVNX2+SN8 +gYUbRJ1aYqaz4n+qiWjCfJ5xJk1KThLEUN4zkqozUEpIn7dMZXyRfEgs8ZeZoEa8Ear rIDg== X-Gm-Message-State: AAQBX9ejfktm9thUeq9UKy1wxNlzny8ffnuNCbIe/rVj185F71Oh6Q40 fCFXZGmMYWiYZt2w5VOaqCD8qW4GScvnDmm0ui0z88DtaG1EB5yryludkLBIOFCqoApa/Jxi/xV CkBhmT9nkLNDf7DtwY/j977oe2kgvLOSeIwTQsgC70BI9t9YBQKvs/VcqTC8= X-Received: by 2002:a17:902:820a:b0:1a6:8d3b:85ed with SMTP id x10-20020a170902820a00b001a68d3b85edmr3385235pln.3.1681729580198; Mon, 17 Apr 2023 04:06:20 -0700 (PDT) X-Google-Smtp-Source: AKy350ZgbgfHU9M+had967DmEwzsgAvKFbbSkWINgnVI0cxMGxyNDF9NAkAYk7KUp8htLUJhK++5WfRnuBaZJYrMPnc= X-Received: by 2002:a17:902:820a:b0:1a6:8d3b:85ed with SMTP id x10-20020a170902820a00b001a68d3b85edmr3385223pln.3.1681729579859; Mon, 17 Apr 2023 04:06:19 -0700 (PDT) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Mon, 17 Apr 2023 13:06:19 +0200 From: Simon Chopin X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Date: Mon, 17 Apr 2023 13:06:19 +0200 Message-ID: Subject: [PATCH] Enable glibc builds on stable release branches To: buildbot@sourceware.org Cc: Simon Chopin Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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 --- 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