Unverified Commit 4d2a0cfb authored by Adam Stephens's avatar Adam Stephens
Browse files

nixos/tests/incus: fix container importing

parent a9372de6

nixos/tests/incus/container.nix

+3 −3
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ let 
    extra;

  };



  container-image-metadata = releases.incusContainerMeta.${pkgs.stdenv.hostPlatform.system};

  container-image-rootfs = releases.incusContainerImage.${pkgs.stdenv.hostPlatform.system};

  container-image-metadata = "${releases.incusContainerMeta.${pkgs.stdenv.hostPlatform.system}}/tarball/nixos-system-${pkgs.stdenv.hostPlatform.system}.tar.xz";

  container-image-rootfs = "${releases.incusContainerImage.${pkgs.stdenv.hostPlatform.system}}/nixos-lxc-image-${pkgs.stdenv.hostPlatform.system}.squashfs";

in

{

  inherit name;
@@ -61,7 +61,7 @@ in 
    machine.succeed("incus admin init --minimal")



    with subtest("Container image can be imported"):

        machine.succeed("incus image import ${container-image-metadata}/*/*.tar.xz ${container-image-rootfs} --alias nixos")

        machine.succeed("incus image import ${container-image-metadata} ${container-image-rootfs} --alias nixos")



    with subtest("Container can be launched and managed"):

        machine.succeed("incus launch nixos container")

nixos/tests/incus/incusd-options.nix

+3 −3
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ import ../make-test-python.nix ( 
      };

    };



    container-image-metadata = releases.incusContainerMeta.${pkgs.stdenv.hostPlatform.system};

    container-image-rootfs = releases.incusContainerImage.${pkgs.stdenv.hostPlatform.system};

    container-image-metadata = "${releases.incusContainerMeta.${pkgs.stdenv.hostPlatform.system}}/tarball/nixos-system-${pkgs.stdenv.hostPlatform.system}.tar.xz";

    container-image-rootfs = "${releases.incusContainerImage.${pkgs.stdenv.hostPlatform.system}}/nixos-lxc-image-${pkgs.stdenv.hostPlatform.system}.squashfs";

  in

  {

    name = "incusd-options";
@@ -87,7 +87,7 @@ import ../make-test-python.nix ( 
      machine.wait_for_unit("incus-preseed.service")



      with subtest("Container image can be imported"):

          machine.succeed("incus image import ${container-image-metadata}/*/*.tar.xz ${container-image-rootfs} --alias nixos")

          machine.succeed("incus image import ${container-image-metadata} ${container-image-rootfs} --alias nixos")



      with subtest("Container can be launched and managed"):

          machine.succeed("incus launch nixos container")