diff --git a/flake.nix b/flake.nix index 88ec225..1283e61 100644 --- a/flake.nix +++ b/flake.nix @@ -101,7 +101,7 @@ 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 { meta.nixpkgs = systemBits.x86_64-linux.pkgs; meta.specialArgs.inputs = inputs; diff --git a/hosts/buildbot/default.nix b/hosts/buildbot/default.nix index 6fea50b..ffc07c0 100755 --- a/hosts/buildbot/default.nix +++ b/hosts/buildbot/default.nix @@ -28,7 +28,7 @@ bagel.services.buildbot = { enable = true; domain = "buildbot.forkos.org"; - builders = [ "builder-11" ]; + builders = [ "builder-10" ]; }; i18n.defaultLocale = "en_US.UTF-8"; diff --git a/services/baremetal-builder/assignments.nix b/services/baremetal-builder/assignments.nix index e1a27de..a173993 100644 --- a/services/baremetal-builder/assignments.nix +++ b/services/baremetal-builder/assignments.nix @@ -20,7 +20,7 @@ in builtins.listToAttrs ( }; } ++ # These are not currently used for hydra - genBuilders { offset = 10; count = 2; f = name: { + genBuilders { offset = 10; count = 1; f = name: { cores = 8; max-jobs = 8; supported-features = [ "kvm" "nixos-test" "big-parallel" ]; diff --git a/terraform/gandi.nix b/terraform/gandi.nix index cf0c93c..911fd2b 100644 --- a/terraform/gandi.nix +++ b/terraform/gandi.nix @@ -89,7 +89,9 @@ in (record "cache" 3600 "CNAME" ["smol.delroth.net."]) (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. - ] ++ 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)); }; }