From 288d338df44c0808ff5e1c041c778aec230c8aed Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Mon, 18 Nov 2024 15:27:46 +0100 Subject: [PATCH 1/2] hydra: Remove Cloud-V RISC-V build worker --- config/services/hydra/nix-config.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/config/services/hydra/nix-config.nix b/config/services/hydra/nix-config.nix index c836a27..b0e8cb1 100644 --- a/config/services/hydra/nix-config.nix +++ b/config/services/hydra/nix-config.nix @@ -28,15 +28,6 @@ supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" ]; sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path; } - { - hostName = "machine-0008.cloud-v.co"; - sshUser = "root"; - maxJobs = 2; - speedFactor = 4; - systems = [ "riscv64-linux" ]; - supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" ]; - sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path; - } ] ++ lib.forEach (lib.genList (i: i + 1) 8) (num: { hostName = "build-worker-0${toString num}"; sshUser = "root"; @@ -63,7 +54,6 @@ "build-worker-04.nyantec.com".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICOq+5I+nlAN2lJoOtoXrYEDuZ/TMPMa43pIlablYigK"; "integra.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIBwEQiSfaDrUAwgul4mktusBPcIVxI4pLNDh9DPopVU"; "schrodinger.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKo7vZ6lS1wx76YsbAdhOsGcc20YMAW52ep8SZ/FCHDp"; - "[machine.cloud-v.co]:20008".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK6Kri0cjPKEXXDEl2GwfwzPO9wuPZEgJS0M6lKRHCqH"; "lab.nyantec.com".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIUePtVPtBK+CYosufbaGiMT4EVanti4V5t2Wg0g/Fy4"; "localhost".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPNVavo3YHVsrYwXRVISu7kDoknn+5inFGySn4azlB8P"; "[build-worker-kyoumanet.fly.dev]:2201".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDL2M97UBHg9aUfjDUxzmzg1r0ga0m3/stummBVwuEAB"; -- 2.47.0 From 7eac95459a0c8c68d16cea608211a53045ffb792 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Mon, 18 Nov 2024 15:28:16 +0100 Subject: [PATCH 2/2] hydra: Add RV64GC ISA support for schrodinger --- config/services/hydra/nix-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/services/hydra/nix-config.nix b/config/services/hydra/nix-config.nix index b0e8cb1..9933888 100644 --- a/config/services/hydra/nix-config.nix +++ b/config/services/hydra/nix-config.nix @@ -25,7 +25,7 @@ maxJobs = 0; speedFactor = 20; systems = [ "riscv64-linux" ]; - supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" ]; + supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" "gccarch-rv64gc" ]; sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path; } ] ++ lib.forEach (lib.genList (i: i + 1) 8) (num: { -- 2.47.0