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 6BA713858CDB for ; Wed, 25 Oct 2023 11:33:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6BA713858CDB 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 6BA713858CDB 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=1698233607; cv=none; b=NAk5hLGs5ZUOqWaJBFgm+5WPMAgWWSQbDwQ8oHiCWZoLAHGxneb1C6OmuWRslFhDqICX5kQXhdGBWO0DewXOTa2JemA2A2AzbDRaImuxKmvaZSwNaM6a86uiX/9yN3Frvd8v3u+zN+FBGMXrx4JNxAas/cp1mEZBdhlF0arIRic= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698233607; c=relaxed/simple; bh=q6l6eUZo2MzwO/+jDUsZv4J7+S5Ro1VdSyI/Zdrvyus=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=F4IF/H7J+O1Jmp2oBEnt124g9Fk4F6uKL8sNyPGL2XfJe3uAPNpNt2MjBcpjNn/nOu7f6RuMIN6WkdKZzoqfiOZaQndexDk+5Mnc5GcFMADDZvmsThfV/WutilS4Cf7+IpoC6wXpPFi3VYKvv62SlMNFFkfMnjFGOROC+ugTeAo= 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 05B58302FDC0; Wed, 25 Oct 2023 13:33:23 +0200 (CEST) Received: by csb.redhat.com (Postfix, from userid 10916) id C6E5B9F234; Wed, 25 Oct 2023 13:33:23 +0200 (CEST) From: Mark Wielaard To: buildbot@sourceware.org Cc: Mark Wielaard Subject: [PATCH] Add new osuosl arm64 worker and move gcc and glibc builders Date: Wed, 25 Oct 2023 13:33:15 +0200 Message-Id: <20231025113315.194251-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=-3034.5 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,SPF_HELO_NONE,SPF_PASS,TXREP 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: --- buildbot.config.sample | 1 + builder/master.cfg | 41 +++++++++++++++++++++++++---------------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/buildbot.config.sample b/buildbot.config.sample index d61fb56..8befa77 100644 --- a/buildbot.config.sample +++ b/buildbot.config.sample @@ -25,6 +25,7 @@ ubuntu22_04-armhf=frob fedora-arm64=frob gentoo-sparc=frob gentoo-sparc-big=frob +osuosl-debian-arm64=frob # Users bb_admin=frob diff --git a/builder/master.cfg b/builder/master.cfg index 0c5ce5b..681d9cc 100644 --- a/builder/master.cfg +++ b/builder/master.cfg @@ -270,12 +270,21 @@ c['workers'].append(ibm_power10_worker) # 8 core arm64 server hosted by osuosl fedora_arm64_worker = worker.Worker("fedora-arm64", - getpw("fedora-arm64"), - max_builds=2, - properties={'ncpus': 6, 'maxcpus': 8}, - notify_on_missing=['mark@klomp.org']); + getpw("fedora-arm64"), + max_builds=2, + properties={'ncpus': 4, 'maxcpus': 8}, + notify_on_missing=['mark@klomp.org']); c['workers'].append(fedora_arm64_worker) +# 16 core arm64 server hosted by osuosl +osuosl_debian_arm64_worker = worker.Worker("osuosl-debian-arm64", + getpw("osuosl-debian-arm64"), + max_builds=1, + properties={'ncpus': 8, + 'maxcpus': 16}, + notify_on_missing=['mark@klomp.org']); +c['workers'].append(osuosl_debian_arm64_worker) + # 'protocols' contains information about protocols which master will use for # communicating with workers. You must define at least 'port' option that workers # could connect to your master with this protocol. @@ -923,7 +932,7 @@ gcc_build_scheduler = schedulers.SingleBranchScheduler( reason="gcc project master branch update", builderNames=["gcc-fedora-x86_64", "gcc-fedora-mingw", - "gcc-fedora-arm64", + "gcc-debian-arm64", "gcc-gentoo-sparc", "gcc-rawhide-x86_64", "gcc-debian-testing-x86_64", @@ -944,7 +953,7 @@ glibc_scheduler = schedulers.AnyBranchScheduler( reason="glibc project release branch update", builderNames=["glibc-fedrawhide-x86_64", "glibc-fedora-x86_64", - "glibc-fedora-arm64"]) + "glibc-debian-arm64"]) c['schedulers'].append(glibc_scheduler) # Quick build only scheduler @@ -3363,13 +3372,13 @@ gcc_fedora_x86_64_builder = util.BuilderConfig( factory=gcc_build_factory) c['builders'].append(gcc_fedora_x86_64_builder) -gcc_fedora_arm64_builder = util.BuilderConfig( - name="gcc-fedora-arm64", +gcc_osuosl_debian_arm64_builder = util.BuilderConfig( + name="gcc-debian-arm64", collapseRequests=True, - workernames=["fedora-arm64"], - tags=["gcc", "fedora", "arm64"], + workernames=["osuosl-debian-arm64"], + tags=["gcc", "debian", "arm64"], factory=gcc_build_factory) -c['builders'].append(gcc_fedora_arm64_builder) +c['builders'].append(gcc_osuosl_debian_arm64_builder) gcc_gentoo_sparc_builder = util.BuilderConfig( name="gcc-gentoo-sparc", @@ -3622,13 +3631,13 @@ glibc_fedora_x86_64_builder = util.BuilderConfig( factory=glibc_factory) c['builders'].append(glibc_fedora_x86_64_builder) -glibc_fedora_arm64_builder = util.BuilderConfig( - name="glibc-fedora-arm64", +glibc_osuosl_debian_arm64_builder = util.BuilderConfig( + name="glibc-debian-arm64", collapseRequests=True, - workernames="fedora-arm64", - tags=["glibc", "fedora", "arm64"], + workernames="osuosl-debian-arm64", + tags=["glibc", "debian", "arm64"], factory=glibc_factory) -c['builders'].append(glibc_fedora_arm64_builder) +c['builders'].append(glibc_osuosl_debian_arm64_builder) glibc_debian_i386_builder = util.BuilderConfig( name="glibc-debian-i386", -- 2.39.3