From: Mark Wielaard <mark@klomp.org>
To: buildbot@sourceware.org
Cc: Mark Wielaard <mark@klomp.org>
Subject: [PATCH] Remove leap and tumblewood x86_64 gcc/gccrust container builders
Date: Sun, 26 Nov 2023 20:21:25 +0100 [thread overview]
Message-ID: <20231126192125.3019352-1-mark@klomp.org> (raw)
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
reply other threads:[~2023-11-26 19:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231126192125.3019352-1-mark@klomp.org \
--to=mark@klomp.org \
--cc=buildbot@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).