From 0d3738cdcc48bd32a7eae9b914440b67c8db252e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Mar 2016 21:48:12 +0200 Subject: Fix the EC2 test We now generate a qcow2 image to prevent hitting Hydra's output size limit. Also updated /root/user-data -> /etc/ec2-metadata/user-data. http://hydra.nixos.org/build/33843133 --- nixos/maintainers/scripts/ec2/amazon-image.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'nixos/maintainers/scripts') diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index ef8646c66d1e..bfa4f4b3ca59 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -10,9 +10,11 @@ with lib; ]; system.build.amazonImage = import ../../../lib/make-disk-image.nix { - inherit pkgs lib config; + inherit lib config; + pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package partitioned = config.ec2.hvm; diskSize = if config.ec2.hvm then 2048 else 8192; + format = "qcow2"; configFile = pkgs.writeText "configuration.nix" '' { -- cgit 1.4.1