diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2020-01-13 02:40:44 +0900 |
|---|---|---|
| committer | Andrew Childs <lorne@cons.org.nz> | 2020-01-13 15:52:37 +0900 |
| commit | e4fa8192da5269756ec225b99f9693e6e702c207 (patch) | |
| tree | 48150ecf49a180c5dabaa6f7831891c469220c1c /nixos/tests/common | |
| parent | c2e5ff3fe8e1e57cfbde9a098f55c8b8c2531b83 (diff) | |
nixos/tests/ec2: return to passing state
Updates required:
- Use vpc image format (new default, supported by Amazon)
- Pass full image filename to makeEc2Test
- Increase memory allocation for nixos-rebuild
- Set a networking.hostName for services.httpd
- Add appropriate escaping in literal userdata
While I'm here, try to make it fail fast.
Diffstat (limited to 'nixos/tests/common')
| -rw-r--r-- | nixos/tests/common/ec2.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/common/ec2.nix b/nixos/tests/common/ec2.nix index 1e69b63191a7..ba087bb60090 100644 --- a/nixos/tests/common/ec2.nix +++ b/nixos/tests/common/ec2.nix @@ -25,7 +25,7 @@ with pkgs.lib; my $imageDir = ($ENV{'TMPDIR'} // "/tmp") . "/vm-state-machine"; mkdir $imageDir, 0700; my $diskImage = "$imageDir/machine.qcow2"; - system("qemu-img create -f qcow2 -o backing_file=${image}/nixos.qcow2 $diskImage") == 0 or die; + system("qemu-img create -f qcow2 -o backing_file=${image} $diskImage") == 0 or die; system("qemu-img resize $diskImage 10G") == 0 or die; # Note: we use net=169.0.0.0/8 rather than @@ -35,7 +35,7 @@ with pkgs.lib; # again when it deletes link-local addresses.) Ideally we'd # turn off the DHCP server, but qemu does not have an option # to do that. - my $startCommand = "qemu-kvm -m 768"; + my $startCommand = "qemu-kvm -m 1024"; $startCommand .= " -device virtio-net-pci,netdev=vlan0"; $startCommand .= " -netdev 'user,id=vlan0,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'"; $startCommand .= " -drive file=$diskImage,if=virtio,werror=report"; |