From 99547f2cc2e088d09dcb95789b07102382682568 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 31 Oct 2026 22:15:26 -0400
Subject: [PATCH 1/3] services/nomad/build/root-pkgs-httpd: use nomad service
 discovery

---
 services/nomad/build/root-pkgs-httpd.nomad | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/nomad/build/root-pkgs-httpd.nomad b/services/nomad/build/root-pkgs-httpd.nomad
index da85a10d..1306cc6c 100644
--- a/services/nomad/build/root-pkgs-httpd.nomad
+++ b/services/nomad/build/root-pkgs-httpd.nomad
@@ -13,8 +13,9 @@ job "build-mirror" {
     }
 
     service {
-      name = "root-pkgs-internal"
-      port = "http"
+      provider = "nomad"
+      name     = "root-pkgs-internal"
+      port     = "http"
     }
 
     volume "root-pkgs" {

From 7d4a8b3f54952c33f6574f0cd596627cea1f8319 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 31 Oct 2026 22:15:48 -0400
Subject: [PATCH 2/3] services/nomad/build/buildbot: use nomad service
 discovery

---
 services/nomad/build/buildbot.nomad | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/services/nomad/build/buildbot.nomad b/services/nomad/build/buildbot.nomad
index 0f118b5e..d10b7a8b 100644
--- a/services/nomad/build/buildbot.nomad
+++ b/services/nomad/build/buildbot.nomad
@@ -34,8 +34,9 @@ job "buildbot" {
     }
 
     service {
-      name = "buildbot-www"
-      port = "http"
+      provider = "nomad"
+      name     = "buildbot-www"
+      port     = "http"
 
       check {
         type         = "http"
@@ -47,13 +48,15 @@ job "buildbot" {
     }
 
     service {
-      name = "buildbot-worker"
-      port = "worker"
+      provider = "nomad"
+      name     = "buildbot-worker"
+      port     = "worker"
     }
 
     service {
-      name = "buildbot-metrics"
-      port = "metrics"
+      provider = "nomad"
+      name     = "buildbot-metrics"
+      port     = "metrics"
     }
 
     task "buildbot" {

From 84290ce8802533e559ea68f65c306eff9559c7bf Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 31 Oct 2026 22:16:20 -0400
Subject: [PATCH 3/3] services/nomad/build/buildbot: use nomad service
 discovery

---
 services/nomad/build/buildbot-worker.nomad | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/services/nomad/build/buildbot-worker.nomad b/services/nomad/build/buildbot-worker.nomad
index 75da4a69..0eca7176 100644
--- a/services/nomad/build/buildbot-worker.nomad
+++ b/services/nomad/build/buildbot-worker.nomad
@@ -121,7 +121,8 @@ job "buildbot-worker" {
 
         template {
           data        = <<EOF
-{{ range service "buildbot-worker" -}}
+{{- $allocID := env "NOMAD_ALLOC_ID" -}}
+{{ range nomadService 1 $allocID "buildbot-worker" -}}
 [buildbot]
 host = {{ .Address }}
 worker-port = {{ .Port }}
@@ -135,6 +136,7 @@ EOF
 
         template {
           data        = <<EOF
+{{- $allocID := env "NOMAD_ALLOC_ID" -}}
 XBPS_MAKEJOBS=${group.value.jobs}
 XBPS_CHROOT_CMD=uchroot
 XBPS_CCACHE=yes
@@ -142,7 +144,7 @@ XBPS_DEBUG_PKGS=yes
 XBPS_USE_GIT_REVS=yes
 XBPS_DISTFILES_MIRROR=https://sources.voidlinux.org
 XBPS_PRESERVE_PKGS=yes
-{{ range service "root-pkgs-internal" }}
+{{ range nomadService 1 $allocID "root-pkgs-internal" }}
 XBPS_MIRROR=http://{{ .Address }}:{{ .Port }}
 {{ end }}
 EOF
@@ -164,7 +166,8 @@ EOF
         // the builders should use the internal mirror
         template {
           data        = <<EOF
-{{ range service "root-pkgs-internal" }}
+{{- $allocID := env "NOMAD_ALLOC_ID" -}}
+{{ range nomadService 1 $allocID "root-pkgs-internal" }}
 {{ if "${group.value.name}" | regexMatch ".*glibc" }}
 repository=http://{{ .Address }}:{{ .Port }}/bootstrap
 repository=http://{{ .Address }}:{{ .Port }}