Skip to content

Commit 0763cc3

Browse files
classabbyampthe-maldridge
authored andcommitted
services/nomad/build/buildbot*: update for buildbot 4.2.1
enable per-package log splitting
1 parent a60650b commit 0763cc3

File tree

3 files changed

+12
-21
lines changed

3 files changed

+12
-21
lines changed

services/nomad/build/buildbot-worker.nomad

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ job "buildbot-worker" {
8888
user = "void-builder"
8989

9090
config {
91-
image = "ghcr.io/void-linux/infra-buildbot-builder:20240928R1"
91+
image = "ghcr.io/void-linux/infra-buildbot-builder:20250422R1"
9292
volumes = [
9393
"local/xbps-repos.conf:/etc/xbps.d/00-repository-main.conf",
9494
"local/xbps-arch.conf:/etc/xbps.d/xbps-arch.conf",

services/nomad/build/buildbot.cfg

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ c = BuildmasterConfig = {
6262
'auth': netauth,
6363
'ui_default_config': {
6464
'Links.build_link_template': "%(build_number)",
65-
'Home.max_recent_builds': 30,
6665
'Waterfall.number_background_waterfall': True,
6766
'Waterfall.show_builders_without_builds': True,
6867
'Builders.show_workers_name': True,
@@ -184,19 +183,13 @@ class ShellCommandWithChanges(steps.ShellCommand):
184183

185184
@util.renderer
186185
def build_packages(props):
187-
# if a better solver is written
188-
# cmds = []
189-
# for p in str(props.getProperty('packages')).strip().split():
190-
# cmds.append(util.ShellArg(
191-
# command=['make', f'built/{p}'],
192-
# logname=f'pkg:{p}',
193-
# haltOnFailure=True,
194-
# ))
195-
cmds = [util.ShellArg(
196-
command=['make', 'all'],
197-
logname='build',
198-
haltOnFailure=True,
199-
)]
186+
cmds = []
187+
for p in str(props.getProperty('packages')).strip().split():
188+
cmds.append(util.ShellArg(
189+
command=['make', f'built/{p}'],
190+
logname=f'pkg:{p}',
191+
haltOnFailure=True,
192+
))
200193
if cmds:
201194
cmds.append(util.ShellArg(
202195
command=['make', 'clean'],

services/nomad/build/buildbot.nomad

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,20 @@ job "buildbot" {
5252
}
5353

5454
service {
55-
name = "buildbot-metrics"
56-
port = "metrics"
55+
name = "buildbot-metrics"
56+
port = "metrics"
5757
}
5858

5959
task "buildbot" {
6060
driver = "docker"
6161

6262
config {
63-
image = "ghcr.io/void-linux/infra-buildbot:20240928R1"
63+
image = "ghcr.io/void-linux/infra-buildbot:20250422R1"
6464
ports = ["http", "worker"]
6565
}
6666

6767
resources {
68-
// see https://github.com/buildbot/buildbot/issues/3011
69-
// (fixed in buildbot 4.1.0)
70-
memory = 2048
68+
memory = 1024
7169
}
7270

7371
meta {

0 commit comments

Comments
 (0)