Skip to content

buildbot 4.2 updates #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
the-maldridge merged 1 commit into from
Apr 22, 2025
Merged

buildbot 4.2 updates #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion services/nomad/build/buildbot-worker.nomad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ job "buildbot-worker" {
user = "void-builder"

config {
image = "ghcr.io/void-linux/infra-buildbot-builder:20240928R1"
image = "ghcr.io/void-linux/infra-buildbot-builder:20250422R1"
volumes = [
"local/xbps-repos.conf:/etc/xbps.d/00-repository-main.conf",
"local/xbps-arch.conf:/etc/xbps.d/xbps-arch.conf",
Expand Down
21 changes: 7 additions & 14 deletions services/nomad/build/buildbot.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ c = BuildmasterConfig = {
'auth': netauth,
'ui_default_config': {
'Links.build_link_template': "%(build_number)",
'Home.max_recent_builds': 30,
'Waterfall.number_background_waterfall': True,
'Waterfall.show_builders_without_builds': True,
'Builders.show_workers_name': True,
Expand Down Expand Up @@ -184,19 +183,13 @@ class ShellCommandWithChanges(steps.ShellCommand):

@util.renderer
def build_packages(props):
# if a better solver is written
# cmds = []
# for p in str(props.getProperty('packages')).strip().split():
# cmds.append(util.ShellArg(
# command=['make', f'built/{p}'],
# logname=f'pkg:{p}',
# haltOnFailure=True,
# ))
cmds = [util.ShellArg(
command=['make', 'all'],
logname='build',
haltOnFailure=True,
)]
cmds = []
for p in str(props.getProperty('packages')).strip().split():
cmds.append(util.ShellArg(
command=['make', f'built/{p}'],
logname=f'pkg:{p}',
haltOnFailure=True,
))
if cmds:
cmds.append(util.ShellArg(
command=['make', 'clean'],
Expand Down
10 changes: 4 additions & 6 deletions services/nomad/build/buildbot.nomad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,22 +52,20 @@ job "buildbot" {
}

service {
name = "buildbot-metrics"
port = "metrics"
name = "buildbot-metrics"
port = "metrics"
}

task "buildbot" {
driver = "docker"

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

resources {
// see https://github.com/buildbot/buildbot/issues/3011
// (fixed in buildbot 4.1.0)
memory = 2048
memory = 1024
}

meta {
Expand Down