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 5590C3858D35 for ; Sun, 7 Jan 2024 20:43:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5590C3858D35 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 5590C3858D35 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=1704660210; cv=none; b=IXQl8X1mb2LgXqaMU1XPZ84hKvR7bKiLVoMwUhDcEBj8YVphfSKZxG1mz1/uQ7PaRLUguO4xTEPQbVbul4DqFaO+ELvySz/rCjR1jjM/1YZW205tZXTXhzeBQKwuINx99nvJUQPlNTPvGBvlbRxznYYbxIGE07L0WV3xknP9C18= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704660210; c=relaxed/simple; bh=MKIrM2F7bKx1EnXkyPS6LpU3azjz9DfG1sOwVCvHElk=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=LkEP3ScJbAI73skjTE0AYxqG74jeLEXD/r1jhgKaV6duBPvFQNL3FiPdvdBROzynNgJFloQ/EzUNxMQuIGzJoFup0HXj3mFAQYdH74Xtm36hcN8m+6rf02b7hqQOhBOgCX+KqnHp+fg8a/ekfi0kISM1T0ia9JVZ0OxaIk/B4s4= 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 D6C57302BB42; Sun, 7 Jan 2024 21:43:25 +0100 (CET) Received: by csb.redhat.com (Postfix, from userid 10916) id A6C99CEF5D; Sun, 7 Jan 2024 21:43:25 +0100 (CET) From: Mark Wielaard To: buildbot@sourceware.org Cc: Mark Wielaard Subject: [PATCH] Reduce the number of x86_64 container builders. Date: Sun, 7 Jan 2024 21:43:21 +0100 Message-Id: <20240107204321.1033601-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.1 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: There is a debian-amd64 full gcc builder, so don't also do a "quick" debian-amd64 build. For binutils and gdb we do centos, fedora, rawhide, sanitize, debian stable and testing x86_64 builds, don't also do opensuse leap and tumbleweed builds. --- builder/master.cfg | 125 ++------------------------------------------- 1 file changed, 5 insertions(+), 120 deletions(-) diff --git a/builder/master.cfg b/builder/master.cfg index d9dcc66..962426f 100644 --- a/builder/master.cfg +++ b/builder/master.cfg @@ -826,9 +826,7 @@ binutils_scheduler = schedulers.SingleBranchScheduler( "binutils-gentoo-sparc", "binutils-debian-i386", "binutils-fedora-ppc64le", - "binutils-ubuntu-riscv", - "binutils-opensusetw-x86_64", - "binutils-opensuseleap-x86_64"]) + "binutils-ubuntu-riscv"]) c['schedulers'].append(binutils_scheduler) binutils_try_scheduler = schedulers.AnyBranchScheduler( @@ -848,9 +846,7 @@ binutils_try_scheduler = schedulers.AnyBranchScheduler( "binutils-try-gentoo-sparc", "binutils-try-debian-i386", "binutils-try-fedora-ppc64le", - "binutils-try-ubuntu-riscv", - "binutils-try-opensusetw-x86_64", - "binutils-try-opensuseleap-x86_64"]) + "binutils-try-ubuntu-riscv"]) c['schedulers'].append(binutils_try_scheduler) # Only trigger scheduler for changes to gdb (or deps) @@ -900,9 +896,7 @@ gdb_scheduler = schedulers.SingleBranchScheduler( "gdb-ibm-power10", "gdb-fedora-s390x", "gdb-debian-ppc64", - "gdb-fedora-ppc64le", - "gdb-opensusetw-x86_64", - "gdb-opensuseleap-x86_64"]) + "gdb-fedora-ppc64le"]) c['schedulers'].append(gdb_scheduler) gdb_try_scheduler = schedulers.AnyBranchScheduler( @@ -921,9 +915,7 @@ gdb_try_scheduler = schedulers.AnyBranchScheduler( "gdb-try-gentoo-sparc", "gdb-try-debian-i386", "gdb-try-fedora-s390x", - "gdb-try-fedora-ppc64le", - "gdb-try-opensusetw-x86_64", - "gdb-try-opensuseleap-x86_64"]) + "gdb-try-fedora-ppc64le"]) c['schedulers'].append(gdb_try_scheduler) # A scheduler for everything binutils-gdb & gcc without filters @@ -975,7 +967,6 @@ gcc_build_scheduler = schedulers.SingleBranchScheduler( "gcc-gentoo-sparc", "gcc-rawhide-x86_64", "gcc-debian-testing-x86_64", - "gcc-debian-amd64", "gcc-debian-i386", "gcc-fedora-ppc64le", # "gcc-debian-ppc64", @@ -1005,9 +996,7 @@ glibc_build_scheduler = schedulers.AnyBranchScheduler( "glibc-fedora-s390x", "glibc-debian-ppc64", "glibc-fedora-ppc64le", - "glibc-gentoo-sparc", - "glibc-opensusetw-x86_64", - "glibc-opensuseleap-x86_64"]) + "glibc-gentoo-sparc"]) c['schedulers'].append(glibc_build_scheduler) gnupoke_scheduler = schedulers.SingleBranchScheduler( @@ -2835,34 +2824,6 @@ binutils_try_ubuntu_riscv_builder = util.BuilderConfig( factory=binutils_factory_gas_binutils) c['builders'].append(binutils_try_ubuntu_riscv_builder) -binutils_opensusetw_x86_64_builder = util.BuilderConfig( - name="binutils-opensusetw-x86_64", - properties={'container-file': - readContainerFile('opensuse-tumbleweed')}, - workernames=vm_workers, - tags=["binutils", "opensusetw", "x86_64"], - factory=binutils_factory_libctf) -c['builders'].append(binutils_opensusetw_x86_64_builder) - -binutils_try_opensusetw_x86_64_builder = util.BuilderConfig( - name="binutils-try-opensusetw-x86_64", - collapseRequests=True, - properties={'container-file': - readContainerFile('opensuse-tumbleweed')}, - workernames=vm_workers, - tags=["binutils-try", "opensusetw", "x86_64"], - factory=binutils_factory_libctf) -c['builders'].append(binutils_try_opensusetw_x86_64_builder) - -binutils_opensuseleap_x86_64_builder = util.BuilderConfig( - name="binutils-opensuseleap-x86_64", - properties={'container-file': - readContainerFile('opensuse-leap')}, - workernames=vm_workers, - tags=["binutils", "opensuseleap", "x86_64"], - factory=binutils_factory) -c['builders'].append(binutils_opensuseleap_x86_64_builder) - binutils_rawhide_x86_64_builder = util.BuilderConfig( name="binutils-rawhide-x86_64", properties={'container-file': @@ -2881,16 +2842,6 @@ binutils_debian_testing_x86_64_builder = util.BuilderConfig( factory=binutils_factory_libctf) c['builders'].append(binutils_debian_testing_x86_64_builder) -binutils_try_opensuseleap_x86_64_builder = util.BuilderConfig( - name="binutils-try-opensuseleap-x86_64", - collapseRequests=True, - properties={'container-file': - readContainerFile('opensuse-leap')}, - workernames=vm_workers, - tags=["binutils-try", "opensuseleap", "x86_64"], - factory=binutils_factory) -c['builders'].append(binutils_try_opensuseleap_x86_64_builder) - binutils_try_rawhide_x86_64_builder = util.BuilderConfig( name="binutils-try-rawhide-x86_64", collapseRequests=True, @@ -3279,34 +3230,6 @@ gdb_try_fedora_ppc64le_builder = util.BuilderConfig( factory=gdb_factory) c['builders'].append(gdb_try_fedora_ppc64le_builder) -gdb_opensusetw_x86_64_builder = util.BuilderConfig( - name="gdb-opensusetw-x86_64", - properties={'container-file': - readContainerFile('opensuse-tumbleweed')}, - workernames=vm_workers, - tags=["gdb", "opensusetw", "x86_64"], - factory=gdb_factory) -c['builders'].append(gdb_opensusetw_x86_64_builder) - -gdb_try_opensusetw_x86_64_builder = util.BuilderConfig( - name="gdb-try-opensusetw-x86_64", - collapseRequests=True, - properties={'container-file': - readContainerFile('opensuse-tumbleweed')}, - workernames=vm_workers, - tags=["gdb-try", "opensusetw", "x86_64"], - factory=gdb_factory) -c['builders'].append(gdb_try_opensusetw_x86_64_builder) - -gdb_opensuseleap_x86_64_builder = util.BuilderConfig( - name="gdb-opensuseleap-x86_64", - properties={'container-file': - readContainerFile('opensuse-leap')}, - workernames=vm_workers, - tags=["gdb", "opensuseleap", "x86_64"], - factory=gdb_factory) -c['builders'].append(gdb_opensuseleap_x86_64_builder) - gdb_rawhide_x86_64_builder = util.BuilderConfig( name="gdb-rawhide-x86_64", properties={'container-file': @@ -3325,16 +3248,6 @@ gdb_debian_testing_x86_64_builder = util.BuilderConfig( factory=gdb_factory) c['builders'].append(gdb_debian_testing_x86_64_builder) -gdb_try_opensuseleap_x86_64_builder = util.BuilderConfig( - name="gdb-try-opensuseleap-x86_64", - collapseRequests=True, - properties={'container-file': - readContainerFile('opensuse-leap')}, - workernames=vm_workers, - tags=["gdb-try", "opensuseleap", "x86_64"], - factory=gdb_factory) -c['builders'].append(gdb_try_opensuseleap_x86_64_builder) - gdb_try_rawhide_x86_64_builder = util.BuilderConfig( name="gdb-try-rawhide-x86_64", collapseRequests=True, @@ -3665,16 +3578,6 @@ gcc_debian_testing_x86_64_builder = util.BuilderConfig( factory=gcc_build_factory) c['builders'].append(gcc_debian_testing_x86_64_builder) -gcc_debian_amd64_builder = util.BuilderConfig( - name="gcc-debian-amd64", - collapseRequests=True, - properties={'container-file': - readContainerFile('debian-stable')}, - workernames=vm_workers, - tags=["gcc", "debian", "x86_64"], - factory=gcc_build_factory) -c['builders'].append(gcc_debian_amd64_builder) - def gcc_full_build_factory_gen(extra_configure_arg=None): gcc_full_build_factory = util.BuildFactory() gcc_full_build_factory.addStep(gcc_build_git_step) @@ -3879,24 +3782,6 @@ glibc_gentoo_sparc_builder = util.BuilderConfig( factory=glibc_factory) c['builders'].append(glibc_gentoo_sparc_builder) -glibc_opensusetw_x86_64_builder = util.BuilderConfig( - name="glibc-opensusetw-x86_64", - properties={'container-file': - readContainerFile('opensuse-tumbleweed')}, - workernames=vm_workers, - tags=["glibc", "opensusetw", "x86_64"], - factory=glibc_build_factory) -c['builders'].append(glibc_opensusetw_x86_64_builder) - -glibc_opensuseleap_x86_64_builder = util.BuilderConfig( - name="glibc-opensuseleap-x86_64", - properties={'container-file': - readContainerFile('opensuse-leap')}, - workernames=vm_workers, - tags=["glibc", "opensuseleap", "x86_64"], - factory=glibc_build_factory) -c['builders'].append(glibc_opensuseleap_x86_64_builder) - glibc_rawhide_x86_64_builder = util.BuilderConfig( name="glibc-rawhide-x86_64", properties={'container-file': -- 2.39.3