From 2b3c54f4a71b42c4f553e74e9106b6aa689cce21 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 13 Nov 2024 16:55:13 -0500
Subject: [PATCH] services/nomad/build/buildbot*: update for buildbot 4.2.1

enable per-package log splitting
---
 services/nomad/build/buildbot-worker.nomad |  2 +-
 services/nomad/build/buildbot.cfg          | 21 +++++++--------------
 services/nomad/build/buildbot.nomad        | 10 ++++------
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/services/nomad/build/buildbot-worker.nomad b/services/nomad/build/buildbot-worker.nomad
index f44bc58b..27794c70 100644
--- a/services/nomad/build/buildbot-worker.nomad
+++ b/services/nomad/build/buildbot-worker.nomad
@@ -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",
diff --git a/services/nomad/build/buildbot.cfg b/services/nomad/build/buildbot.cfg
index 6865f2eb..cbcc47f9 100644
--- a/services/nomad/build/buildbot.cfg
+++ b/services/nomad/build/buildbot.cfg
@@ -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,
@@ -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'],
diff --git a/services/nomad/build/buildbot.nomad b/services/nomad/build/buildbot.nomad
index ec406d29..243f12b1 100644
--- a/services/nomad/build/buildbot.nomad
+++ b/services/nomad/build/buildbot.nomad
@@ -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 {