From 4210e2c48031d1b802706f534c9e32ebaf952717 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Sun, 12 Jan 2025 20:07:28 +0300
Subject: [PATCH] refactor(ops/tvl-buildkite): remove hardcoded whitby
 references

Change-Id: I3b2df9d3926f4698cbc0b557ad5b522e1921ca13
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12988
Autosubmit: tazjin <tazjin@tvl.su>
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: aaqaishtyaq <aaqaishtyaq@gmail.com>
Tested-by: BuildkiteCI
---
 ops/modules/tvl-buildkite.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ops/modules/tvl-buildkite.nix b/ops/modules/tvl-buildkite.nix
index 3c6d88404..d9d79cd52 100644
--- a/ops/modules/tvl-buildkite.nix
+++ b/ops/modules/tvl-buildkite.nix
@@ -5,8 +5,9 @@ let
   cfg = config.services.depot.buildkite;
   agents = lib.range 1 cfg.agentCount;
   description = "Buildkite agents for TVL";
+  hostname = config.networking.hostName;
 
-  besadiiWithConfig = name: pkgs.writeShellScript "besadii-whitby" ''
+  besadiiWithConfig = name: pkgs.writeShellScript "besadii-${hostname}" ''
     export BESADII_CONFIG=/run/agenix/buildkite-besadii-config
     exec -a ${name} ${depot.ops.besadii}/bin/besadii "$@"
   '';
@@ -36,7 +37,7 @@ in
     # Run the Buildkite agents using the default upstream module.
     services.buildkite-agents = builtins.listToAttrs (map
       (n: rec {
-        name = "whitby-${toString n}";
+        name = "${hostname}-${toString n}";
         value = {
           inherit name;
           enable = true;
@@ -47,6 +48,8 @@ in
             export PATH=$PATH:/run/wrappers/bin
           '';
 
+          tags.hostname = hostname;
+
           runtimePackages = with pkgs; [
             bash
             coreutils
@@ -67,7 +70,7 @@ in
       groups.buildkite-agents = { };
       users = builtins.listToAttrs (map
         (n: rec {
-          name = "buildkite-agent-whitby-${toString n}";
+          name = "buildkite-agent-${hostname}-${toString n}";
           value = {
             isSystemUser = true;
             group = lib.mkForce "buildkite-agents";