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 <raito@lix.systems>
This commit is contained in:
parent
9aea7dc6df
commit
b6516a9605
1 changed files with 7 additions and 8 deletions
|
|
@ -65,10 +65,12 @@ in
|
||||||
export PATH=$PATH:/run/wrappers/bin
|
export PATH=$PATH:/run/wrappers/bin
|
||||||
'';
|
'';
|
||||||
|
|
||||||
tags.hostname = hostname;
|
tags = {
|
||||||
|
# all agents support small jobs
|
||||||
# all agents support small jobs
|
small = "true";
|
||||||
tags.small = "true";
|
inherit hostname;
|
||||||
|
large = if n <= cfg.largeSlots then "true" else "false";
|
||||||
|
};
|
||||||
|
|
||||||
runtimePackages = with pkgs; [
|
runtimePackages = with pkgs; [
|
||||||
bash
|
bash
|
||||||
|
|
@ -81,10 +83,7 @@ in
|
||||||
jq
|
jq
|
||||||
nix
|
nix
|
||||||
];
|
];
|
||||||
}
|
};
|
||||||
// (lib.optionalAttrs (n <= cfg.largeSlots) {
|
|
||||||
tags.large = "true";
|
|
||||||
});
|
|
||||||
})
|
})
|
||||||
agents
|
agents
|
||||||
);
|
);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue