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 4CB1D3858C29 for ; Sun, 26 Nov 2023 19:21:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4CB1D3858C29 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 4CB1D3858C29 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=1701026491; cv=none; b=ZYJJFxPF+eInUtOYXCVz/xoeKDxY85aQRoNw7Dpg5UXI/2JfWn0tIZE1SBOxXUgX1NilvXTMa5fuhGdMs92vf3eMPp3/L8Q5cLLEUXVZoMUIDUTGlxKORTqv9xCXnO79YwC+HHmqRUt9KrXc7lUhE49Wpsq9yroAf8R/7h/RaCo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701026491; c=relaxed/simple; bh=HpXTTwv4ldBNHOb2uvYDGO6fYakL/hybR+6upDEwWL4=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=knMQU05O51jIV5MT6/zSTuIBda12fimog2N5SQ1n692W8wF5IiP36C7mbWwXE5MWRZxBLLC9XzIBjRyXpAxpQVYuA4pMm89m9L2fxDJlDGbNMti+Z953aleEUiXZvbKrHPrHUTlPKQpyU0h63irtaG4HPcImlNtln9UiY2Gf45A= 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 2205C30291AB; Sun, 26 Nov 2023 20:21:29 +0100 (CET) Received: by csb.redhat.com (Postfix, from userid 10916) id EE215CF38E; Sun, 26 Nov 2023 20:21:28 +0100 (CET) From: Mark Wielaard To: buildbot@sourceware.org Cc: Mark Wielaard Subject: [PATCH] Remove leap and tumblewood x86_64 gcc/gccrust container builders Date: Sun, 26 Nov 2023 20:21:25 +0100 Message-Id: <20231126192125.3019352-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=-10.7 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: We already have a lot of x86_64 gcc container builders (fedora, rawhide, debian debian-testing and a full debian amd64 builder, plus a fedora mingw builder). Each gcc builder uses a couple of GB of disk on each container worker. Removing these 4 builders frees up ~10GB per worker. --- builder/master.cfg | 46 ++-------------------------------------------- 1 file changed, 2 insertions(+), 44 deletions(-) diff --git a/builder/master.cfg b/builder/master.cfg index 8077514..04c54da 100644 --- a/builder/master.cfg +++ b/builder/master.cfg @@ -761,9 +761,7 @@ gccrust_scheduler = schedulers.SingleBranchScheduler( "gccrust-gentoo-sparc", "gccrust-fedora-ppc64le", "gccrust-fedora-s390x", - "gccrust-debian-ppc64", - "gccrust-opensusetw-x86_64", - "gccrust-opensuseleap-x86_64"]) + "gccrust-debian-ppc64"]) c['schedulers'].append(gccrust_scheduler) gccrust_bootstrap_scheduler = schedulers.SingleBranchScheduler( @@ -962,10 +960,8 @@ gcc_build_scheduler = schedulers.SingleBranchScheduler( "gcc-debian-amd64", "gcc-debian-i386", "gcc-fedora-ppc64le", - "gcc-fedora-s390x", # "gcc-debian-ppc64", - "gcc-opensusetw-x86_64", - "gcc-opensuseleap-x86_64"]) + "gcc-fedora-s390x"]) c['schedulers'].append(gcc_build_scheduler) glibc_scheduler = schedulers.AnyBranchScheduler( @@ -2429,24 +2425,6 @@ gccrust_debian_ppc64_builder = util.BuilderConfig( factory=gccrust_factory) c['builders'].append(gccrust_debian_ppc64_builder) -gccrust_opensusetw_x86_64_builder = util.BuilderConfig( - name="gccrust-opensusetw-x86_64", - properties={'container-file': - readContainerFile('opensuse-tumbleweed')}, - workernames=vm_workers, - tags=["gccrust", "opensusetw", "x86_64"], - factory=gccrust_factory) -c['builders'].append(gccrust_opensusetw_x86_64_builder) - -gccrust_opensuseleap_x86_64_builder = util.BuilderConfig( - name="gccrust-opensuseleap-x86_64", - properties={'container-file': - readContainerFile('opensuse-leap')}, - workernames=vm_workers, - tags=["gccrust", "opensuseleap", "x86_64"], - factory=gccrust_factory) -c['builders'].append(gccrust_opensuseleap_x86_64_builder) - gccrust_rawhide_x86_64_builder = util.BuilderConfig( name="gccrust-rawhide-x86_64", properties={'container-file': @@ -3567,26 +3545,6 @@ gcc_fedora_ppc64le_builder = util.BuilderConfig( factory=gcc_build_factory) c['builders'].append(gcc_fedora_ppc64le_builder) -gcc_opensusetw_x86_64_builder = util.BuilderConfig( - name="gcc-opensusetw-x86_64", - collapseRequests=True, - properties={'container-file': - readContainerFile('opensuse-tumbleweed')}, - workernames=vm_workers, - tags=["gcc", "opensusetw", "x86_64"], - factory=gcc_build_factory) -c['builders'].append(gcc_opensusetw_x86_64_builder) - -gcc_opensuseleap_x86_64_builder = util.BuilderConfig( - name="gcc-opensuseleap-x86_64", - collapseRequests=True, - properties={'container-file': - readContainerFile('opensuse-leap')}, - workernames=vm_workers, - tags=["gcc", "opensuseleap", "x86_64"], - factory=gcc_build_factory) -c['builders'].append(gcc_opensuseleap_x86_64_builder) - gcc_rawhide_x86_64_builder = util.BuilderConfig( name="gcc-rawhide-x86_64", collapseRequests=True, -- 2.39.3