diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-30 21:48:12 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-30 21:50:23 +0200 |
| commit | 0d3738cdcc48bd32a7eae9b914440b67c8db252e (patch) | |
| tree | 0d26f5a0b694f98adf0acfc5edb29ccf5a3f9f37 /nixos/maintainers/scripts/ec2/amazon-image.nix | |
| parent | 184b7ba3c684c5be64c4908ac4973f71865acf4e (diff) | |
| download | nixpkgs-0d3738cdcc48bd32a7eae9b914440b67c8db252e.tar nixpkgs-0d3738cdcc48bd32a7eae9b914440b67c8db252e.tar.gz nixpkgs-0d3738cdcc48bd32a7eae9b914440b67c8db252e.tar.bz2 nixpkgs-0d3738cdcc48bd32a7eae9b914440b67c8db252e.tar.lz nixpkgs-0d3738cdcc48bd32a7eae9b914440b67c8db252e.tar.xz nixpkgs-0d3738cdcc48bd32a7eae9b914440b67c8db252e.tar.zst nixpkgs-0d3738cdcc48bd32a7eae9b914440b67c8db252e.zip | |
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
Diffstat (limited to 'nixos/maintainers/scripts/ec2/amazon-image.nix')
| -rw-r--r-- | nixos/maintainers/scripts/ec2/amazon-image.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index ef8646c66d1..bfa4f4b3ca5 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" '' { |