From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id C42FD3858D28 for ; Mon, 15 Jan 2024 23:50:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C42FD3858D28 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C42FD3858D28 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=45.83.234.184 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705362618; cv=none; b=e1Rfq0KCRV1e2rDhKqmM5VGJnwLU7XS1BKn1qkPl1aRJCHZPC3k3lDyDzdnhVvJwnZD5opIiVKcNdJwdAMHavERMHT4kF4lx/v7avH5XoBQph0OEhqgdGE/EbGGy6flCicTGq8WBiydSldN78YY+okM9GQKMcciJi572gkZ6ov4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705362618; c=relaxed/simple; bh=DJ7oxQfzXVmePdbzpYeBs6RVfmakMyctCmiqCZgYmWY=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=wKgHNqvS8RiSQNEhO87liDhSdGh5610PM1Bd6HR1d1y3L0dGXCGqr4t/Hy4DWDd4pZPPB1z4KUsFHb69cj5weh+9dszxIVpOG4hqWp5DDTde39/59BMptybXiwjP2Aqg07jdU08vmWUnz4BAtlOEitG5xfwomMT+SFFBRstsjjI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from csb.redhat.com (deer0x03.wildebeest.org [172.31.17.133]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 634E3302BBEA; Tue, 16 Jan 2024 00:50:14 +0100 (CET) Received: by csb.redhat.com (Postfix, from userid 10916) id 290C0CEF2C; Tue, 16 Jan 2024 00:50:14 +0100 (CET) From: Mark Wielaard To: buildbot@sourceware.org Cc: Mark Wielaard Subject: [COMMITTED] Add collapseRequests for debian-testing and fedora-rawhide builders Date: Tue, 16 Jan 2024 00:50:10 +0100 Message-Id: <20240115235010.146253-1-mark@klomp.org> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,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: These builds don't add much over the stable debian and fedora x86_64 container builders. But they do take up container worker slots. So just collapse the builds when possible to free up x86_64 containers for other builds. --- builder/master.cfg | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/builder/master.cfg b/builder/master.cfg index a31483d..fcf9ec8 100644 --- a/builder/master.cfg +++ b/builder/master.cfg @@ -1514,6 +1514,7 @@ bzip2_rawhide_x86_64_builder = util.BuilderConfig( readContainerFile('fedora-rawhide')}, workernames=vm_workers, tags=["bzip2", "fedora", "x86_64"], + collapseRequests=True, factory=bzip2_factory) c['builders'].append(bzip2_rawhide_x86_64_builder) @@ -1523,6 +1524,7 @@ bzip2_debian_testing_x86_64_builder = util.BuilderConfig( readContainerFile('debian-testing')}, workernames=vm_workers, tags=["bzip2", "debian", "x86_64"], + collapseRequests=True, factory=bzip2_factory) c['builders'].append(bzip2_debian_testing_x86_64_builder) @@ -1660,6 +1662,7 @@ debugedit_rawhide_x86_64_builder = util.BuilderConfig( readContainerFile('fedora-rawhide')}, workernames=vm_workers, tags=["debugedit", "fedora", "x86_64"], + collapseRequests=True, factory=debugedit_factory) c['builders'].append(debugedit_rawhide_x86_64_builder) @@ -1669,6 +1672,7 @@ debugedit_debian_testing_x86_64_builder = util.BuilderConfig( readContainerFile('debian-testing')}, workernames=vm_workers, tags=["debugedit", "debian", "x86_64"], + collapseRequests=True, factory=debugedit_factory) c['builders'].append(debugedit_debian_testing_x86_64_builder) @@ -1812,6 +1816,7 @@ dwz_rawhide_x86_64_builder = util.BuilderConfig( readContainerFile('fedora-rawhide')}, workernames=vm_workers, tags=["dwz", "fedora", "x86_64"], + collapseRequests=True, factory=dwz_factory) c['builders'].append(dwz_rawhide_x86_64_builder) @@ -1821,6 +1826,7 @@ dwz_debian_testing_x86_64_builder = util.BuilderConfig( readContainerFile('debian-testing')}, workernames=vm_workers, tags=["dwz", "debian", "x86_64"], + collapseRequests=True, factory=dwz_factory) c['builders'].append(dwz_debian_testing_x86_64_builder) @@ -2287,6 +2293,7 @@ elfutils_rawhide_x86_64_builder = util.BuilderConfig( readContainerFile('fedora-rawhide')}, workernames=vm_workers, tags=["elfutils", "fedora", "x86_64"], + collapseRequests=True, factory=elfutils_factory_distcheck) c['builders'].append(elfutils_rawhide_x86_64_builder) @@ -2306,6 +2313,7 @@ elfutils_debian_testing_x86_64_builder = util.BuilderConfig( readContainerFile('debian-testing')}, workernames=vm_workers, tags=["elfutils", "debian", "x86_64"], + collapseRequests=True, factory=elfutils_factory_distcheck) c['builders'].append(elfutils_debian_testing_x86_64_builder) @@ -2500,6 +2508,7 @@ gccrust_rawhide_x86_64_builder = util.BuilderConfig( readContainerFile('fedora-rawhide')}, workernames=vm_workers, tags=["gccrust", "fedora", "x86_64"], + collapseRequests=True, factory=gccrust_factory) c['builders'].append(gccrust_rawhide_x86_64_builder) @@ -2509,6 +2518,7 @@ gccrust_debian_testing_x86_64_builder = util.BuilderConfig( readContainerFile('debian-testing')}, workernames=vm_workers, tags=["gccrust", "debian", "x86_64"], + collapseRequests=True, factory=gccrust_factory) c['builders'].append(gccrust_debian_testing_x86_64_builder) @@ -2853,6 +2863,7 @@ binutils_rawhide_x86_64_builder = util.BuilderConfig( readContainerFile('fedora-rawhide')}, workernames=vm_workers, tags=["binutils", "fedora", "x86_64"], + collapseRequests=True, factory=binutils_factory_libctf) c['builders'].append(binutils_rawhide_x86_64_builder) @@ -2862,6 +2873,7 @@ binutils_debian_testing_x86_64_builder = util.BuilderConfig( readContainerFile('debian-testing')}, workernames=vm_workers, tags=["binutils", "debian", "x86_64"], + collapseRequests=True, factory=binutils_factory_libctf) c['builders'].append(binutils_debian_testing_x86_64_builder) @@ -3262,6 +3274,7 @@ gdb_rawhide_x86_64_builder = util.BuilderConfig( readContainerFile('fedora-rawhide')}, workernames=vm_workers, tags=["gdb", "fedora", "x86_64"], + collapseRequests=True, factory=gdb_factory) c['builders'].append(gdb_rawhide_x86_64_builder) @@ -3271,6 +3284,7 @@ gdb_debian_testing_x86_64_builder = util.BuilderConfig( readContainerFile('debian-testing')}, workernames=vm_workers, tags=["gdb", "debian", "x86_64"], + collapseRequests=True, factory=gdb_factory) c['builders'].append(gdb_debian_testing_x86_64_builder) @@ -3817,6 +3831,7 @@ glibc_rawhide_x86_64_builder = util.BuilderConfig( readContainerFile('fedora-rawhide')}, workernames=vm_workers, tags=["glibc", "fedora", "x86_64"], + collapseRequests=True, factory=glibc_build_factory) c['builders'].append(glibc_rawhide_x86_64_builder) @@ -3826,6 +3841,7 @@ glibc_debian_testing_x86_64_builder = util.BuilderConfig( readContainerFile('debian-testing')}, workernames=vm_workers, tags=["glibc", "debian", "x86_64"], + collapseRequests=True, factory=glibc_build_factory) c['builders'].append(glibc_debian_testing_x86_64_builder) @@ -4144,6 +4160,7 @@ libabigail_rawhide_x86_64_builder = util.BuilderConfig( readContainerFile('fedora-rawhide')}, workernames=vm_workers, tags=["libabigail", "fedora", "x86_64"], + collapseRequests=True, factory=libabigail_factory) c['builders'].append(libabigail_rawhide_x86_64_builder) @@ -4163,6 +4180,7 @@ libabigail_debian_testing_x86_64_builder = util.BuilderConfig( readContainerFile('debian-testing')}, workernames=vm_workers, tags=["libabigail", "debian", "x86_64"], + collapseRequests=True, factory=libabigail_factory) c['builders'].append(libabigail_debian_testing_x86_64_builder) @@ -4432,6 +4450,7 @@ valgrind_rawhide_x86_64_builder = util.BuilderConfig( readContainerFile('fedora-rawhide')}, workernames=vm_workers, tags=["valgrind", "fedora", "x86_64"], + collapseRequests=True, factory=valgrind_make_check_aux_factory) c['builders'].append(valgrind_rawhide_x86_64_builder) @@ -4441,6 +4460,7 @@ valgrind_debian_testing_x86_64_builder = util.BuilderConfig( readContainerFile('debian-testing')}, workernames=vm_workers, tags=["valgrind", "debian", "x86_64"], + collapseRequests=True, factory=valgrind_make_check_aux_factory) c['builders'].append(valgrind_debian_testing_x86_64_builder) @@ -4649,6 +4669,7 @@ annobin_rawhide_x86_64_builder = util.BuilderConfig( properties={'container-file': readContainerFile('fedora-rawhide')}, workernames=vm_workers, + collapseRequests=True, factory=annobin_factory) c['builders'].append(annobin_rawhide_x86_64_builder) -- 2.39.3