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 D00C73831CA1 for ; Wed, 15 Jun 2022 00:12:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D00C73831CA1 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org Received: from reform (deer0x09.wildebeest.org [172.31.17.139]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 5F24A302BBEB; Wed, 15 Jun 2022 02:12:47 +0200 (CEST) Received: by reform (Postfix, from userid 1000) id CC3B02E83DEA; Wed, 15 Jun 2022 02:12:46 +0200 (CEST) From: Mark Wielaard To: buildbot@sourceware.org Cc: Mark Wielaard Subject: [COMMITTED] Add a second debian-i386 worker, binutils and gdb builders Date: Wed, 15 Jun 2022 02:12:42 +0200 Message-Id: <20220615001242.723485-1-mark@klomp.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.5 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 X-BeenThere: buildbot@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "The https://builder.sourceware.org/ buildbot" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jun 2022 00:12:50 -0000 The fedora-x86 and debian-amd64 workers have been moved to the container worker. That provides more vcpus and memory for centos-x86_64. And allows a second debian-i386 worker. Add i386 builders for binutils and gdb. --- buildbot.config.sample | 3 +-- builder/master.cfg | 42 +++++++++++++++++++++++++++++++++--------- htdocs/index.html | 4 ++++ 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/buildbot.config.sample b/buildbot.config.sample index 5c9335e..deba731 100644 --- a/buildbot.config.sample +++ b/buildbot.config.sample @@ -6,9 +6,8 @@ sourceware=frob centos-x86_64=frob debian-arm64=frob -fedora-x86_64=frob -debian-amd64=frob debian-i386=frob +debian-i386-2=frob debian-armhf=frob fedora-s390x=frob fedora-ppc64le=frob diff --git a/builder/master.cfg b/builder/master.cfg index d1e169b..8455dfe 100644 --- a/builder/master.cfg +++ b/builder/master.cfg @@ -56,11 +56,11 @@ sourceware_worker = worker.Worker("sourceware", notify_on_missing="buildbot@sourceware.org") c['workers'].append(sourceware_worker) -# 2 libvirt workers on shared Intel Core i7-7700 machine +# 3 libvirt workers on shared Intel Core i7-7700 machine centos_x86_64_worker = worker.Worker("centos-x86_64", getpw("centos-x86_64"), max_builds=1, - properties={'ncpus': 4}, + properties={'ncpus': 8}, notify_on_missing='mark@klomp.org'); c['workers'].append(centos_x86_64_worker) debian_i386_worker = worker.Worker("debian-i386", @@ -69,6 +69,14 @@ debian_i386_worker = worker.Worker("debian-i386", properties={'ncpus': 4}, notify_on_missing='mark@klomp.org'); c['workers'].append(debian_i386_worker) +debian_i386_2_worker = worker.Worker("debian-i386-2", + getpw("debian-i386-2"), + max_builds=1, + properties={'ncpus': 4}, + notify_on_missing='mark@klomp.org'); +c['workers'].append(debian_i386_2_worker) + +debian_i386_workers = ['debian-i386', 'debian-i386-2'] # armv7l board Rockchip RK3288 Asus Tinker Board S, 2GB memory debian_armhf_worker = worker.Worker("debian-armhf", @@ -433,6 +441,7 @@ binutils_scheduler = schedulers.SingleBranchScheduler( "binutils-debian-ppc64", "binutils-debian-armhf", "binutils-debian-arm64", + "binutils-debian-i386", "binutils-fedora-ppc64le", "binutils-opensusetw-x86_64", "binutils-opensuseleap-x86_64"]) @@ -476,6 +485,7 @@ gdb_scheduler = schedulers.SingleBranchScheduler( "gdb-fedora-x86_64", "gdb-debian-armhf", "gdb-debian-arm64", + "gdb-debian-i386", "gdb-fedora-s390x", "gdb-debian-ppc64", "gdb-fedora-ppc64le", @@ -696,7 +706,7 @@ c['builders'].append(bzip2_debian_armhf_builder) bzip2_debian_i386_builder = util.BuilderConfig( name="bzip2-debian-i386", - workernames=["debian-i386"], + workernames=debian_i386_workers, tags=["bzip2", "debian", "i386"], factory=bzip2_factory) c['builders'].append(bzip2_debian_i386_builder) @@ -805,7 +815,7 @@ c['builders'].append(debugedit_debian_armhf_builder) debugedit_debian_i386_builder = util.BuilderConfig( name="debugedit-debian-i386", - workernames=["debian-i386"], + workernames=debian_i386_workers, tags=["debugedit", "debian", "i386"], factory=debugedit_factory) c['builders'].append(debugedit_debian_i386_builder) @@ -912,7 +922,7 @@ c['builders'].append(dwz_debian_armhf_builder) dwz_debian_i386_builder = util.BuilderConfig( name="dwz-debian-i386", - workernames=["debian-i386"], + workernames=debian_i386_workers, tags=["dwz", "debian", "i386"], factory=dwz_factory) c['builders'].append(dwz_debian_i386_builder) @@ -1111,7 +1121,7 @@ c['builders'].append(elfutils_debian_armhf_builder) elfutils_debian_i386_builder = util.BuilderConfig( name="elfutils-debian-i386", - workernames=["debian-i386"], + workernames=debian_i386_workers, tags=["elfutils", "debian", "i386"], factory=elfutils_factory_mua) c['builders'].append(elfutils_debian_i386_builder) @@ -1214,7 +1224,7 @@ c['builders'].append(gccrust_fedora_x86_64_builder) gccrust_debian_i386_builder = util.BuilderConfig( name="gccrust-debian-i386", - workernames=["debian-i386"], + workernames=debian_i386_workers, tags=["gccrust", "debian", "i386"], factory=gccrust_factory) c['builders'].append(gccrust_debian_i386_builder) @@ -1383,6 +1393,13 @@ binutils_debian_arm64_builder = util.BuilderConfig( factory=binutils_factory) c['builders'].append(binutils_debian_arm64_builder) +binutils_debian_i386_builder = util.BuilderConfig( + name="binutils-debian-i386", + workernames=debian_i386_workers, + tags=["binutils", "debian", "i386"], + factory=binutils_factory) +c['builders'].append(binutils_debian_i386_builder) + binutils_fedora_ppc64le_builder = util.BuilderConfig( name="binutils-fedora-ppc64le", workernames=["fedora-ppc64le"], @@ -1546,6 +1563,13 @@ gdb_debian_arm64_builder = util.BuilderConfig( factory=gdb_factory) c['builders'].append(gdb_debian_arm64_builder) +gdb_debian_i386_builder = util.BuilderConfig( + name="gdb-debian-i386", + workernames=debian_i386_workers, + tags=["gdb", "debian", "i386"], + factory=gdb_factory) +c['builders'].append(gdb_debian_i386_builder) + gdb_fedora_s390x_builder = util.BuilderConfig( name="gdb-fedora-s390x", workernames=["fedora-s390x"], @@ -1773,7 +1797,7 @@ c['builders'].append(libabigail_debian_amd64_builder) libabigail_debian_i386_builder = util.BuilderConfig( name="libabigail-debian-i386", - workernames=["debian-i386"], + workernames=debian_i386_workers, tags=["libabigail", "debian", "i386"], factory=libabigail_factory_checkonly) c['builders'].append(libabigail_debian_i386_builder) @@ -1884,7 +1908,7 @@ c['builders'].append(valgrind_debian_arm64_builder) valgrind_debian_i386_builder = util.BuilderConfig( name="valgrind-debian-i386", - workernames=["debian-i386"], + workernames=debian_i386_workers, tags=["valgrind", "debian", "i386"], factory=valgrind_make_check_aux_factory) c['builders'].append(valgrind_debian_i386_builder) diff --git a/htdocs/index.html b/htdocs/index.html index 8837cd1..a4df826 100644 --- a/htdocs/index.html +++ b/htdocs/index.html @@ -49,6 +49,8 @@ debian-arm64
 + debian-i386
+ fedora-ppc64le
 opensusetw-x86_64
@@ -187,6 +189,8 @@ debian-arm64
 + debian-i386
+ fedora-s390x
 debian-ppc64
-- 2.30.2