nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 15:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixos/tests/ec2-nixops: fix build

Browse Source 
- change image format to qcow2
- add 10 minute meta.timeout
- add 2 minute timeout to ssh check
This commit is contained in:
ghpzin 2024-08-29 12:37:00 +03:00
parent 851f477be1
commit f25def232a
No known key found for this signature in database
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/tests/ec2.nix
View File

@ -22,6 +22,8 @@ let
ln -s vda1 /dev/xvda1 ln -s vda1 /dev/xvda1
''; '';
amazonImage.format = "qcow2";
# In a NixOS test the serial console is occupied by the "backdoor" # In a NixOS test the serial console is occupied by the "backdoor"
# (see testing/test-instrumentation.nix) and is incompatible with # (see testing/test-instrumentation.nix) and is incompatible with
# the configuration in virtualisation/amazon-image.nix. # the configuration in virtualisation/amazon-image.nix.
@ -53,7 +55,7 @@ let
} }
]; ];
}).config; }).config;
image = "${imageCfg.system.build.amazonImage}/${imageCfg.amazonImage.name}.vhd"; image = "${imageCfg.system.build.amazonImage}/${imageCfg.amazonImage.name}.qcow2";
sshKeys = import ./ssh-keys.nix pkgs; sshKeys = import ./ssh-keys.nix pkgs;
snakeOilPrivateKey = sshKeys.snakeOilPrivateKey.text; snakeOilPrivateKey = sshKeys.snakeOilPrivateKey.text;
@ -63,6 +65,7 @@ let
in { in {
boot-ec2-nixops = makeEc2Test { boot-ec2-nixops = makeEc2Test {
name = "nixops-userdata"; name = "nixops-userdata";
meta.timeout = 600;
inherit image; inherit image;
sshPublicKey = snakeOilPublicKey; # That's right folks! My user's key is also the host key! sshPublicKey = snakeOilPublicKey; # That's right folks! My user's key is also the host key!
@ -95,7 +98,7 @@ in {
machine.succeed( machine.succeed(
"echo localhost,127.0.0.1 ${snakeOilPublicKey} > ~/.ssh/known_hosts" "echo localhost,127.0.0.1 ${snakeOilPublicKey} > ~/.ssh/known_hosts"
) )
machine.succeed("ssh -o BatchMode=yes localhost exit") machine.succeed("ssh -o BatchMode=yes localhost exit", timeout=120)
# Test whether the root disk was resized. # Test whether the root disk was resized.
blocks, block_size = map(int, machine.succeed("stat -c %b:%S -f /").split(":")) blocks, block_size = map(int, machine.succeed("stat -c %b:%S -f /").split(":"))