From a92263f628fb8c1ecc6196273ff0e541c8dcf073 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 20 Jun 2026 02:22:17 -0400
Subject: [PATCH 1/2] ansible: configure a-nbg-de as a buildbot worker

---
 .../host_vars/a-nbg-de.m.voidlinux.org.yml    | 20 +++++++++++++++++++
 ansible/inventory                             |  1 +
 ansible/roles/nomad_client/tasks/main.yml     |  1 +
 3 files changed, 22 insertions(+)

diff --git a/ansible/host_vars/a-nbg-de.m.voidlinux.org.yml b/ansible/host_vars/a-nbg-de.m.voidlinux.org.yml
index b1fd885b..674d0ebb 100644
--- a/ansible/host_vars/a-nbg-de.m.voidlinux.org.yml
+++ b/ansible/host_vars/a-nbg-de.m.voidlinux.org.yml
@@ -14,3 +14,23 @@ network_static_interfaces:
 
 sshd_AllowGroups:
   - build-ops
+
+buildworker_archs:
+  - x86_64
+
+nomad_meta:
+  builder: "true"
+
+nomad_host_volumes:
+  - name: x86_64-glibc_hostdir
+    path: /hostdir
+    read_only: false
+  - name: x86_64-glibc_workdir
+    path: /workdir
+    read_only: false
+  - name: x86_64-glibc_buildrootdir
+    path: /buildroot
+    read_only: false
+  - name: ccache
+    path: /hostdir/ccache
+    read_only: true
diff --git a/ansible/inventory b/ansible/inventory
index 02e1d24a..8f837995 100644
--- a/ansible/inventory
+++ b/ansible/inventory
@@ -2,6 +2,7 @@
 a-hel-fi.m.voidlinux.org
 a-fsn-de.m.voidlinux.org
 b-fsn-de.m.voidlinux.org
+a-nbg-de.m.voidlinux.org
 
 [root_mirror]
 a-fsn-de.m.voidlinux.org
diff --git a/ansible/roles/nomad_client/tasks/main.yml b/ansible/roles/nomad_client/tasks/main.yml
index dc3e5b4f..8687bcc3 100644
--- a/ansible/roles/nomad_client/tasks/main.yml
+++ b/ansible/roles/nomad_client/tasks/main.yml
@@ -8,6 +8,7 @@
     mode: "0644"
   vars:
     nomad_retry_join_servers: "{{ groups['hashimaster'] | map('extract', void_mesh) | list | sort }}"
+  tags: [configure_nomad_client]
   notify:
     - nomad
 

From c58e1d1ca718b0cc2745a5718b1aa5b9cee37fac Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 20 Jun 2026 03:20:00 -0400
Subject: [PATCH 2/2] services/nomad/buildbot*: split x86_64-glibc into its own
 builder

---
 services/nomad/build/buildbot-worker.nomad | 3 ++-
 services/nomad/build/buildbot.nomad        | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/services/nomad/build/buildbot-worker.nomad b/services/nomad/build/buildbot-worker.nomad
index 3e564f6f..75da4a69 100644
--- a/services/nomad/build/buildbot-worker.nomad
+++ b/services/nomad/build/buildbot-worker.nomad
@@ -9,6 +9,7 @@ job "buildbot-worker" {
       // memory is ~90% of capacity
       // memory_max is ~95% of capacity
       { name = "glibc", jobs = 10, cpu = 38100, mem = 115840, mem_max = 122270 },
+      { name = "x86_64-glibc", jobs = 8, cpu = 15000, mem = 14000, mem_max = 15000 },
       { name = "musl", jobs = 6, cpu = 21700, mem = 57690, mem_max = 60890 },
       { name = "aarch64", jobs = 6, cpu = 12000, mem = 28500, mem_max = 30500 },
     ]
@@ -164,7 +165,7 @@ EOF
         template {
           data        = <<EOF
 {{ range service "root-pkgs-internal" }}
-{{ if eq "${group.value.name}" "glibc" }}
+{{ if "${group.value.name}" | regexMatch ".*glibc" }}
 repository=http://{{ .Address }}:{{ .Port }}/bootstrap
 repository=http://{{ .Address }}:{{ .Port }}
 repository=http://{{ .Address }}:{{ .Port }}/nonfree
diff --git a/services/nomad/build/buildbot.nomad b/services/nomad/build/buildbot.nomad
index 8e7b20ec..0f118b5e 100644
--- a/services/nomad/build/buildbot.nomad
+++ b/services/nomad/build/buildbot.nomad
@@ -102,12 +102,13 @@ EOF
       template {
         data = jsonencode({
           workers = [
-            { name = "glibc", max-builds = 4 },
+            { name = "glibc", max-builds = 3 },
+            { name = "x86_64-glibc", max-builds = 1 },
             { name = "musl", max-builds = 3 },
             { name = "aarch64", max-builds = 2 },
           ],
           builders = [
-            { name = "x86_64", host = "x86_64", worker = "glibc", },
+            { name = "x86_64", host = "x86_64", worker = "x86_64-glibc", },
             { name = "i686", host = "i686", worker = "glibc", },
             { name = "armv7l", host = "x86_64", target = "armv7l", worker = "glibc", },
             { name = "armv6l", host = "x86_64", target = "armv6l", worker = "glibc", },