nixosTests.lxc: move to runTestOn

This commit is contained in:
Adam C. Stephens
2025-11-09 20:35:15 -05:00
parent 0cd29d61c5
commit f77edd59d2
2 changed files with 117 additions and 120 deletions

View File

@@ -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;

View File

@@ -1,7 +1,6 @@
import ../make-test-python.nix (
{ pkgs, lib, ... }:
{ pkgs, lib, ... }:
let
let
releases = import ../../release.nix {
configuration = {
# Building documentation makes the test unnecessarily take a longer time:
@@ -15,21 +14,20 @@ 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";
in
{
in
{
name = "lxc-container-unprivileged";
meta = {
maintainers = lib.teams.lxc.members;
};
nodes.machine =
{ lib, pkgs, ... }:
{
nodes.machine = {
virtualisation = {
diskSize = 6144;
cores = 2;
@@ -127,5 +125,4 @@ import ../make-test-python.nix (
machine.fail("su -- bob -c 'lxc-start test'")
'';
}
)
}