the-distro/infra
9
0
Fork 5
Code Issues 39 Pull requests 8 Packages Projects 1 Releases Wiki Activity

Reserve builder-11 for build coordination, rename to build-coord

Browse source
This commit is contained in:
Pierre Bourdon 2024-08-13 19:12:36 +02:00
parent 5ace7a63d8
commit 90325344a3
Signed by: delroth
GPG key ID: 6FB80DCD84DA0F1C
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -101,7 +101,7 @@
bagel.baremetal.builders = { enable = true; num = i; netboot = i >= 6; }; bagel.baremetal.builders = { enable = true; num = i; netboot = i >= 6; };
}; };
builders = lib.listToAttrs (lib.genList makeBuilder 12); builders = lib.listToAttrs (lib.genList makeBuilder 11);
in { in {
meta.nixpkgs = systemBits.x86_64-linux.pkgs; meta.nixpkgs = systemBits.x86_64-linux.pkgs;
meta.specialArgs.inputs = inputs; meta.specialArgs.inputs = inputs;

2
hosts/buildbot/default.nix
View file

@ -28,7 +28,7 @@
bagel.services.buildbot = { bagel.services.buildbot = {
enable = true; enable = true;
domain = "buildbot.forkos.org"; domain = "buildbot.forkos.org";
builders = [ "builder-11" ]; builders = [ "builder-10" ];
}; };
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";

2
services/baremetal-builder/assignments.nix
View file

@ -20,7 +20,7 @@ in builtins.listToAttrs (
}; } }; }
++ ++
# These are not currently used for hydra # These are not currently used for hydra
genBuilders { offset = 10; count = 2; f = name: { genBuilders { offset = 10; count = 1; f = name: {
cores = 8; cores = 8;
max-jobs = 8; max-jobs = 8;
supported-features = [ "kvm" "nixos-test" "big-parallel" ]; supported-features = [ "kvm" "nixos-test" "big-parallel" ];

4
terraform/gandi.nix
View file

@ -89,7 +89,9 @@ in
(record "cache" 3600 "CNAME" ["smol.delroth.net."]) (record "cache" 3600 "CNAME" ["smol.delroth.net."])
(record "vpn-gw.wob01.infra" 3600 "AAAA" [ "2a01:584:11::2" ]) (record "vpn-gw.wob01.infra" 3600 "AAAA" [ "2a01:584:11::2" ])
(record "build-coord.wob01.infra" 3600 "AAAA" [ "2a01:584:11::1:11" ])
# TODO: do not hardcode, just reuse the Colmena hive module outputs to generate all the required details. # TODO: do not hardcode, just reuse the Colmena hive module outputs to generate all the required details.
] ++ map (index: record "builder-${toString index}.wob01.infra" 3600 "AAAA" [ "2a01:584:11::1:${toString index}" ]) (genList lib.id 12)); ] ++ map (index: record "builder-${toString index}.wob01.infra" 3600 "AAAA" [ "2a01:584:11::1:${toString index}" ]) (genList lib.id 11));
}; };
} }