Unverified Commit f77edd59 authored by Adam C. Stephens's avatar Adam C. Stephens
Browse files

nixosTests.lxc: move to runTestOn

parent 0cd29d61

nixos/tests/all-tests.nix

+1 −1
Original line number Diff line number Diff line
@@ -889,7 +889,7 @@ in 
  lorri = handleTest ./lorri/default.nix { };

  luks = runTest ./luks.nix;

  lvm2 = handleTest ./lvm2 { };

  lxc = handleTest ./lxc { };

  lxc = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./lxc;

  lxd-image-server = runTest ./lxd-image-server.nix;

  lxqt = runTest ./lxqt.nix;

  ly = runTest ./ly.nix;

nixos/tests/lxc/default.nix

+113 −116
Original line number Diff line number Diff line 
import ../make-test-python.nix (

{ pkgs, lib, ... }:



let
@@ -15,6 +14,7 @@ import ../make-test-python.nix ( 
  lxc-image-metadata =

    releases.incusContainerMeta.${pkgs.stdenv.hostPlatform.system}

    + "/tarball/nixos-image-lxc-*-${pkgs.stdenv.hostPlatform.system}.tar.xz";

  # the incus container rootfs is in squashfs, but lxc requires tar.xz so use containerTarball

  lxc-image-rootfs =

    releases.containerTarball.${pkgs.stdenv.hostPlatform.system}

    + "/tarball/nixos-image-lxc-*-${pkgs.stdenv.hostPlatform.system}.tar.xz";
@@ -27,9 +27,7 @@ import ../make-test-python.nix ( 
    maintainers = lib.teams.lxc.members;

  };



    nodes.machine =

      { lib, pkgs, ... }:

      {

  nodes.machine = {

    virtualisation = {

      diskSize = 6144;

      cores = 2;
@@ -128,4 +126,3 @@ import ../make-test-python.nix ( 
    machine.fail("su -- bob -c 'lxc-start test'")

  '';

}
 
)