From b6516a96052ec6898eaef23d961b5448743b8f7c Mon Sep 17 00:00:00 2001 From: Ryan Lahfa Date: Mon, 17 Mar 2025 17:29:51 +0100 Subject: [PATCH] fix(ops/modules/buildkite): merge tags appropriately Everything was large=true and then nothing was small=true and did not have a hostname. This is fixed. Change-Id: Id90e6246f9ab44ce020d999e975dd8b4cd4492c9 Signed-off-by: Ryan Lahfa --- ops/modules/snix-buildkite.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/ops/modules/snix-buildkite.nix b/ops/modules/snix-buildkite.nix index 00ac63610..770e03303 100644 --- a/ops/modules/snix-buildkite.nix +++ b/ops/modules/snix-buildkite.nix @@ -65,10 +65,12 @@ in export PATH=$PATH:/run/wrappers/bin ''; - tags.hostname = hostname; - - # all agents support small jobs - tags.small = "true"; + tags = { + # all agents support small jobs + small = "true"; + inherit hostname; + large = if n <= cfg.largeSlots then "true" else "false"; + }; runtimePackages = with pkgs; [ bash @@ -81,10 +83,7 @@ in jq nix ]; - } - // (lib.optionalAttrs (n <= cfg.largeSlots) { - tags.large = "true"; - }); + }; }) agents );