Move hydra-provisioner to chef
Eelco Dolstra committed
Sep 4, 2017 at 18:08 UTC
b8cced2c2d9cb11869e3c713dad7530f35df9699
2 files changed
+5
-10
hydra-provisioner/conf.nix
+2
-6
@@ -2,19 +2,15 @@
2
3
tag = "hydra-provisioned-nixos-org";
4
5
- statusCommand = [ "ssh" "-x" "hydra-queue-runner@hydra.nixos.org" "PGPASSFILE=/var/lib/hydra/pgpass-queue-runner" "hydra-queue-runner" "--status" ];
6
- updateCommand = [ "ssh" "-x" "hydra-queue-runner@hydra.nixos.org" "cat > /var/lib/hydra/provisioner/machines" ];
7
-
5
systemTypes.x86_64-linux = {
6
nixopsExpr = builtins.toPath ./nixops.nix;
10
- #nixPath = [ "nixpkgs=https://nixos.org/channels/nixos-16.03/nixexprs.tar.xz" ];
11
- nixPath = [ "nixpkgs=/home/eelco.dolstra/src/nixpkgs" ];
7
+ nixPath = [ "nixpkgs=channel:nixos-17.03" ];
8
minMachines = 0;
9
maxMachines = 12;
10
ignoredRunnables = 250;
11
runnablesPerMachine = 50;
12
maxJobs = 4;
17
- sshKey = "/var/lib/hydra/queue-runner/.ssh/id_buildfarm";
13
+ sshKey = "/var/lib/hydra/queue-runner/.ssh/id_buildfarm_rsa";
14
};
15
16
}
hydra-provisioner/nixops.nix
+3
-4
@@ -2,7 +2,7 @@
2
3
let
4
region = "us-east-1";
5
- accessKeyId = "lb-nixos";
5
+ accessKeyId = "hydra-provisioner";
6
in
7
8
{
@@ -31,12 +31,11 @@ in
31
imports =
32
[ <nixpkgs/nixos/modules/profiles/minimal.nix>
33
<hydra-provisioner/auto-shutdown.nix>
34
- ../delft/diffoscope.nix
34
+ #../delft/diffoscope.nix
35
];
36
37
users.extraUsers.root.openssh.authorizedKeys.keys =
38
- [ # ''command="nix-store --serve --write" ${builtins.readFile ~/.ssh/id_dsa.pub} # for testing
39
- ''command="nix-store --serve --write" ssh-dss AAAAB3NzaC1kc3MAAACBAMHRjGSDaBp4Z30JF4S9ApabBCpdr57Ad0aD9oH2A/WEFnWYQSAzK4E/HHD2DV2XP1stNkZ1ks2v3F4Yu/veR+qVlUWbJW1RIIfuQgkG44K0R3C2qx4BAZUVYzju1NVCJbBOO6ipVY9cfmpokV52HZFhP/2HocTNLoav3F0AsbbJAAAAFQDaJiQdpJBEa4Wr5FfVl1kYqmQZJwAAAIEAwbern5XL+SNIMa+sJ3CBhrWyYExYWiUbdmhQEfyEAUmoPsEr1qpb+0WREic9Nrxz48QWZDK5xMvzZyQEkuAMJUBWcdm12rME7WMvg7OZGr9DADjAtfMfj3Ui2XvOuQ3ia/OTsMGkQTDWnkOM9Ni128SNSl9urFBlXATdGvo+468AAACBAK8s6LddhhkRqsF/l/L2ooS8c8A1rTFWAOy3/sgXFNvMyS/Mig2p966xRrRHr7Bc+H2SuKEE5WmLCXqymgxLHhrFU4zm/W/ej1yB1CAThd4xUfgJu4touJROjvcD1zzlmLeat0fp2k5mCuiLKcTKi0vxKWiiopF9nvBBK+7ODPC7 buildfarm@nixos''
38
+ [ ''command="nix-store --serve --write" ${(import ../ssh-keys.nix).hydra-queue-runner}''
39
];
40
41
nix.package = pkgs.nixUnstable;