mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 23:43:30 +00:00
15c760d6b8
`make-disk-image` is a tool for creating VM images. It takes an argument `contents` that allows one to specify files and directories that should be copied into the VM image. However, directories end up not at the specified target, but instead at a subdirectory of the target, with a nix-store-like path, e.g. `/target/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-source`. See issue https://github.com/NixOS/nixpkgs/issues/226203 . This change adds a test for make-disk-image's contents directory handling and adds a fix (appending `/` to rsync input directory names). This closes issue https://github.com/NixOS/nixpkgs/issues/226203 .
63 lines
1.6 KiB
Nix
63 lines
1.6 KiB
Nix
# Tests the contents attribute of nixos/lib/make-disk-image.nix
|
|
# including its user, group, and mode attributes.
|
|
{ system ? builtins.currentSystem,
|
|
config ? {},
|
|
pkgs ? import ../.. { inherit system config; }
|
|
}:
|
|
|
|
with import ../lib/testing-python.nix { inherit system pkgs; };
|
|
with pkgs.lib;
|
|
|
|
with import common/ec2.nix { inherit makeTest pkgs; };
|
|
|
|
let
|
|
config = (import ../lib/eval-config.nix {
|
|
inherit system;
|
|
modules = [
|
|
../modules/testing/test-instrumentation.nix
|
|
../modules/profiles/qemu-guest.nix
|
|
{
|
|
fileSystems."/".device = "/dev/disk/by-label/nixos";
|
|
boot.loader.grub.device = "/dev/vda";
|
|
boot.loader.timeout = 0;
|
|
}
|
|
];
|
|
}).config;
|
|
image = (import ../lib/make-disk-image.nix {
|
|
inherit pkgs config;
|
|
lib = pkgs.lib;
|
|
format = "qcow2";
|
|
contents = [
|
|
{
|
|
source = pkgs.writeText "testFile" "contents";
|
|
target = "/testFile";
|
|
user = "1234";
|
|
group = "5678";
|
|
mode = "755";
|
|
}
|
|
{
|
|
source = ./.;
|
|
target = "/testDir";
|
|
}
|
|
];
|
|
}) + "/nixos.qcow2";
|
|
|
|
in makeEc2Test {
|
|
name = "image-contents";
|
|
inherit image;
|
|
userData = null;
|
|
script = ''
|
|
machine.start()
|
|
# Test that if contents includes a file, it is copied to the target.
|
|
assert "content" in machine.succeed("cat /testFile")
|
|
fileDetails = machine.succeed("ls -l /testFile")
|
|
assert "1234" in fileDetails
|
|
assert "5678" in fileDetails
|
|
assert "rwxr-xr-x" in fileDetails
|
|
|
|
# Test that if contents includes a directory, it is copied to the target.
|
|
dirList = machine.succeed("ls /testDir")
|
|
assert "image-contents.nix" in dirList
|
|
'';
|
|
}
|