Previous hydra-provisioner updates
Eelco Dolstra committed
May 31, 2016 at 09:34 UTC
08bf6c6691fbab8b28889d71da27edc3e38cb48e
2 files changed
+6
-5
hydra-provisioner/conf.nix
+3
-3
@@ -2,12 +2,12 @@
2
3
tag = "hydra-provisioned-nixos-org";
4
5
- statusCommand = [ "ssh" "-x" "hydra-queue-runner@hydra-new.nixos.org" "PGPASSFILE=/var/lib/hydra/pgpass-queue-runner" "hydra-queue-runner" "--status" ];
6
- updateCommand = [ "ssh" "-x" "hydra-queue-runner@hydra-new.nixos.org" "cat > /var/lib/hydra/provisioner/machines" ];
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
8
systemTypes.x86_64-linux = {
9
nixopsExpr = builtins.toPath ./nixops.nix;
10
- nixPath = [ "nixpkgs=https://nixos.org/channels/nixos-15.09-small/nixexprs.tar.xz" ];
10
+ nixPath = [ "nixpkgs=https://nixos.org/channels/nixos-16.03/nixexprs.tar.xz" ];
11
minMachines = 0;
12
maxMachines = 12;
13
ignoredRunnables = 250;
hydra-provisioner/nixops.nix
+3
-2
@@ -19,10 +19,11 @@ in
19
deployment.ec2.region = region;
20
deployment.ec2.instanceType = "m4.xlarge";
21
deployment.ec2.spotInstancePrice = 10;
22
+ deployment.ec2.spotInstanceTimeout = 5 * 60;
23
deployment.ec2.keyPair = resources.ec2KeyPairs.default;
23
- deployment.ec2.subnetId = "subnet-0723eb5e";
24
+ deployment.ec2.subnetId = "subnet-1eb22868";
25
deployment.ec2.associatePublicIpAddress = true;
25
- deployment.ec2.securityGroupIds = [ "sg-67a05003" ];
26
+ deployment.ec2.securityGroupIds = [ "sg-b2ee60ca" ];
27
deployment.ec2.tags.Name = "Hydra Builder";
28
deployment.ec2.ebsInitialRootDiskSize = 100;
29
deployment.owners = [ "eelco.dolstra@logicblox.com" ];