nixosTests.lxc: move to runTestOn
This commit is contained in:
@@ -889,7 +889,7 @@ in
|
|||||||
lorri = handleTest ./lorri/default.nix { };
|
lorri = handleTest ./lorri/default.nix { };
|
||||||
luks = runTest ./luks.nix;
|
luks = runTest ./luks.nix;
|
||||||
lvm2 = handleTest ./lvm2 { };
|
lvm2 = handleTest ./lvm2 { };
|
||||||
lxc = handleTest ./lxc { };
|
lxc = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./lxc;
|
||||||
lxd-image-server = runTest ./lxd-image-server.nix;
|
lxd-image-server = runTest ./lxd-image-server.nix;
|
||||||
lxqt = runTest ./lxqt.nix;
|
lxqt = runTest ./lxqt.nix;
|
||||||
ly = runTest ./ly.nix;
|
ly = runTest ./ly.nix;
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import ../make-test-python.nix (
|
{ pkgs, lib, ... }:
|
||||||
{ pkgs, lib, ... }:
|
|
||||||
|
|
||||||
let
|
let
|
||||||
releases = import ../../release.nix {
|
releases = import ../../release.nix {
|
||||||
configuration = {
|
configuration = {
|
||||||
# Building documentation makes the test unnecessarily take a longer time:
|
# Building documentation makes the test unnecessarily take a longer time:
|
||||||
@@ -15,21 +14,20 @@ import ../make-test-python.nix (
|
|||||||
lxc-image-metadata =
|
lxc-image-metadata =
|
||||||
releases.incusContainerMeta.${pkgs.stdenv.hostPlatform.system}
|
releases.incusContainerMeta.${pkgs.stdenv.hostPlatform.system}
|
||||||
+ "/tarball/nixos-image-lxc-*-${pkgs.stdenv.hostPlatform.system}.tar.xz";
|
+ "/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 =
|
lxc-image-rootfs =
|
||||||
releases.containerTarball.${pkgs.stdenv.hostPlatform.system}
|
releases.containerTarball.${pkgs.stdenv.hostPlatform.system}
|
||||||
+ "/tarball/nixos-image-lxc-*-${pkgs.stdenv.hostPlatform.system}.tar.xz";
|
+ "/tarball/nixos-image-lxc-*-${pkgs.stdenv.hostPlatform.system}.tar.xz";
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
name = "lxc-container-unprivileged";
|
name = "lxc-container-unprivileged";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
maintainers = lib.teams.lxc.members;
|
maintainers = lib.teams.lxc.members;
|
||||||
};
|
};
|
||||||
|
|
||||||
nodes.machine =
|
nodes.machine = {
|
||||||
{ lib, pkgs, ... }:
|
|
||||||
{
|
|
||||||
virtualisation = {
|
virtualisation = {
|
||||||
diskSize = 6144;
|
diskSize = 6144;
|
||||||
cores = 2;
|
cores = 2;
|
||||||
@@ -127,5 +125,4 @@ import ../make-test-python.nix (
|
|||||||
|
|
||||||
machine.fail("su -- bob -c 'lxc-start test'")
|
machine.fail("su -- bob -c 'lxc-start test'")
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
)
|
|
||||||
|
|||||||
Reference in New Issue
Block a user