hydra: switch to buildMachinesFiles (#303)
This commit is contained in:
parent
59a315e437
commit
7efcb78dff
2 changed files with 9 additions and 14 deletions
|
@ -70,6 +70,14 @@ in {
|
||||||
|
|
||||||
services.hydra = {
|
services.hydra = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
# remote builders set in /etc/nix/machines + localhost
|
||||||
|
buildMachinesFiles = [
|
||||||
|
"/etc/nix/machines"
|
||||||
|
|
||||||
|
(pkgs.writeText "local" ''
|
||||||
|
localhost x86_64-linux,builtin - 8 1 nixos-test,big-parallel,kvm - -
|
||||||
|
'')
|
||||||
|
];
|
||||||
hydraURL = "https://hydra.nix-community.org";
|
hydraURL = "https://hydra.nix-community.org";
|
||||||
notificationSender = "hydra@hydra.nix-community.org";
|
notificationSender = "hydra@hydra.nix-community.org";
|
||||||
port = hydraPort;
|
port = hydraPort;
|
||||||
|
@ -81,18 +89,6 @@ in {
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
nix = {
|
|
||||||
distributedBuilds = true;
|
|
||||||
buildMachines = [
|
|
||||||
{
|
|
||||||
hostName = "localhost";
|
|
||||||
systems = ["x86_64-linux" "builtin"];
|
|
||||||
maxJobs = 8;
|
|
||||||
supportedFeatures = ["nixos-test" "big-parallel" "kvm"];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
services.postgresql = {
|
services.postgresql = {
|
||||||
enable = true;
|
enable = true;
|
||||||
ensureDatabases = ["hydra"];
|
ensureDatabases = ["hydra"];
|
||||||
|
|
3
tasks.py
3
tasks.py
|
@ -23,8 +23,7 @@ def deploy_nixos(hosts: List[DeployHost]) -> None:
|
||||||
f"rsync {' --exclude '.join([''] + RSYNC_EXCLUDES)} -vaF --delete -e ssh . {target}:/etc/nixos"
|
f"rsync {' --exclude '.join([''] + RSYNC_EXCLUDES)} -vaF --delete -e ssh . {target}:/etc/nixos"
|
||||||
)
|
)
|
||||||
|
|
||||||
# FIXME: build03 has itself as a builder and deadlocks building packages.
|
h.run(f"nixos-rebuild switch --option accept-flake-config true")
|
||||||
h.run(f"nixos-rebuild switch --builders '' --option accept-flake-config true")
|
|
||||||
|
|
||||||
g.run_function(deploy)
|
g.run_function(deploy)
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue