darkkirb/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

use the correct key path for hydra-evaluator

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2024-12-01 14:40:07 +01:00
parent 990d315d7b
commit d0d671f3a9
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
1 changed files with 40 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
config/services/hydra.nix
View file

@ -14,43 +14,45 @@ let
build-aarch64 aarch64-linux,riscv32-linux,riscv64-linux - 4 1 nixos-test,benchmark,ca-derivations,gccarch-armv8-a,gccarch-armv8.1-a,gccarch-armv8.2-a,big-parallel - build-aarch64 aarch64-linux,riscv32-linux,riscv64-linux - 4 1 nixos-test,benchmark,ca-derivations,gccarch-armv8-a,gccarch-armv8.1-a,gccarch-armv8.2-a,big-parallel -
build-riscv riscv64-linux,riscv32-linux - 4 2 nixos-test,benchmark,ca-derivations,gccarch-rv64gc_zba_zbb,gccarch-rv64gc_zba,gccarch-rv64gc_zbb,ccarch-rv64gc,gccarch-rv32gc_zba_zbb,gccarch-rv32gc_zba,gccarch-rv32gc_zbb,gccarch-rv32gc,big-parallel,native-riscv - build-riscv riscv64-linux,riscv32-linux - 4 2 nixos-test,benchmark,ca-derivations,gccarch-rv64gc_zba_zbb,gccarch-rv64gc_zba,gccarch-rv64gc_zbb,ccarch-rv64gc,gccarch-rv32gc_zba_zbb,gccarch-rv32gc_zba,gccarch-rv32gc_zbb,gccarch-rv32gc,big-parallel,native-riscv -
''; '';
sshConfig = pkgs.writeText "ssh-config" '' sshConfig =
Host build-aarch64 home:
Port 22 pkgs.writeText "ssh-config" ''
IdentitiesOnly yes Host build-aarch64
User remote-build Port 22
HostName instance-20221213-1915.int.chir.rs IdentitiesOnly yes
IdentityFile /var/lib/hydra/queue-runner/.ssh/builder_id_ed25519 User remote-build
Host build-nas HostName instance-20221213-1915.int.chir.rs
Port 22 IdentityFile ${home}/.ssh/builder_id_ed25519
IdentitiesOnly yes Host build-nas
User remote-build Port 22
HostName nas.int.chir.rs IdentitiesOnly yes
IdentityFile /var/lib/hydra/queue-runner/.ssh/builder_id_ed25519 User remote-build
Host build-rainbow-resort HostName nas.int.chir.rs
Port 22 IdentityFile ${home}/.ssh/builder_id_ed25519
IdentitiesOnly yes Host build-rainbow-resort
User remote-build Port 22
HostName rainbow-resort.int.chir.rs IdentitiesOnly yes
IdentityFile /var/lib/hydra/queue-runner/.ssh/builder_id_ed25519 User remote-build
Host build-riscv HostName rainbow-resort.int.chir.rs
Port 22 IdentityFile ${home}/.ssh/builder_id_ed25519
IdentitiesOnly yes Host build-riscv
User remote-build Port 22
HostName not522.tailbab65.ts.net IdentitiesOnly yes
IdentityFile /var/lib/hydra/queue-runner/.ssh/builder_id_ed25519 User remote-build
HostName not522.tailbab65.ts.net
IdentityFile ${home}/.ssh/builder_id_ed25519
Host * Host *
ForwardAgent no ForwardAgent no
Compression no Compression no
ServerAliveInterval 0 ServerAliveInterval 0
ServerAliveCountMax 3 ServerAliveCountMax 3
HashKnownHosts no HashKnownHosts no
UserKnownHostsFile ~/.ssh/known_hosts UserKnownHostsFile ~/.ssh/known_hosts
ControlMaster auto ControlMaster auto
ControlPath ~/.ssh/master-%r@%n:%p ControlPath ~/.ssh/master-%r@%n:%p
ControlPersist 10m ControlPersist 10m
''; '';
nix-eval-jobs-script = pkgs.stdenvNoCC.mkDerivation { nix-eval-jobs-script = pkgs.stdenvNoCC.mkDerivation {
name = "remote-eval-jobs.py"; name = "remote-eval-jobs.py";
src = ./hydra/remote-eval-jobs.py; src = ./hydra/remote-eval-jobs.py;
@ -200,10 +202,10 @@ in
system.activationScripts.setupHydraSshConfig = lib.stringAfter [ "var" ] '' system.activationScripts.setupHydraSshConfig = lib.stringAfter [ "var" ] ''
mkdir -p /var/lib/hydra/queue-runner/.ssh/ mkdir -p /var/lib/hydra/queue-runner/.ssh/
chown -Rv hydra-queue-runner /var/lib/hydra/queue-runner chown -Rv hydra-queue-runner /var/lib/hydra/queue-runner
ln -svf ${sshConfig} /var/lib/hydra/queue-runner/.ssh/config ln -svf ${sshConfig "/var/lib/hydra/queue-runner"} /var/lib/hydra/queue-runner/.ssh/config
mkdir -p /var/lib/hydra/.ssh/ mkdir -p /var/lib/hydra/.ssh/
chown -Rv hydra /var/lib/hydra/.ssh chown -Rv hydra /var/lib/hydra/.ssh
ln -svf ${sshConfig} /var/lib/hydra/.ssh/config ln -svf ${sshConfig "/var/lib/hydra"} /var/lib/hydra/.ssh/config
''; '';
sops.secrets."attic/config.toml" = { sops.secrets."attic/config.toml" = {
owner = "hydra-queue-runner"; owner = "hydra-queue-runner";