nixos/tests/ec2-nixops: fix build (#338147)

authored by

Aleksana and committed by
GitHub
9b4a8db8 f500fa5c

+5 -2
+5 -2
nixos/tests/ec2.nix
··· 22 22 ln -s vda1 /dev/xvda1 23 23 ''; 24 24 25 + amazonImage.format = "qcow2"; 26 + 25 27 # In a NixOS test the serial console is occupied by the "backdoor" 26 28 # (see testing/test-instrumentation.nix) and is incompatible with 27 29 # the configuration in virtualisation/amazon-image.nix. ··· 53 55 } 54 56 ]; 55 57 }).config; 56 - image = "${imageCfg.system.build.amazonImage}/${imageCfg.amazonImage.name}.vhd"; 58 + image = "${imageCfg.system.build.amazonImage}/${imageCfg.amazonImage.name}.qcow2"; 57 59 58 60 sshKeys = import ./ssh-keys.nix pkgs; 59 61 snakeOilPrivateKey = sshKeys.snakeOilPrivateKey.text; ··· 63 65 in { 64 66 boot-ec2-nixops = makeEc2Test { 65 67 name = "nixops-userdata"; 68 + meta.timeout = 600; 66 69 inherit image; 67 70 sshPublicKey = snakeOilPublicKey; # That's right folks! My user's key is also the host key! 68 71 ··· 95 98 machine.succeed( 96 99 "echo localhost,127.0.0.1 ${snakeOilPublicKey} > ~/.ssh/known_hosts" 97 100 ) 98 - machine.succeed("ssh -o BatchMode=yes localhost exit") 101 + machine.succeed("ssh -o BatchMode=yes localhost exit", timeout=120) 99 102 100 103 # Test whether the root disk was resized. 101 104 blocks, block_size = map(int, machine.succeed("stat -c %b:%S -f /").split(":"))