nixosTests.lxc: move to runTestOn

nixos/tests/all-tests.nix

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

@@ -1,131 +1,128 @@
-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:
-        documentation.enable = lib.mkForce false;
+      documentation.enable = lib.mkForce false;
-        documentation.nixos.enable = lib.mkForce false;
+      documentation.nixos.enable = lib.mkForce false;
-        # including a channel forces images to be rebuilt on any changes
+      # including a channel forces images to be rebuilt on any changes
-        system.installer.channel.enable = lib.mkForce false;
+      system.installer.channel.enable = lib.mkForce false;
+    };
+  };
+
+  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
+{
+  name = "lxc-container-unprivileged";
+
+  meta = {
+    maintainers = lib.teams.lxc.members;
+  };
+
+  nodes.machine = {
+    virtualisation = {
+      diskSize = 6144;
+      cores = 2;
+      memorySize = 512;
+      writableStore = true;
+
+      lxc = {
+        enable = true;
+        unprivilegedContainers = true;
+        systemConfig = ''
+          lxc.lxcpath = /tmp/lxc
+        '';
+        defaultConfig = ''
+          lxc.net.0.type = veth
+          lxc.net.0.link = lxcbr0
+          lxc.net.0.flags = up
+          lxc.net.0.hwaddr = 00:16:3e:xx:xx:xx
+          lxc.idmap = u 0 100000 65536
+          lxc.idmap = g 0 100000 65536
+        '';
+        # Permit user alice to connect to bridge
+        usernetConfig = ''
+          @lxc-user veth lxcbr0 10
+        '';
+        bridgeConfig = ''
+          LXC_IPV6_ADDR=""
+          LXC_IPV6_MASK=""
+          LXC_IPV6_NETWORK=""
+          LXC_IPV6_NAT="false"
+        '';
       };
     };
 
-    lxc-image-metadata =
+    # Needed for lxc
-      releases.incusContainerMeta.${pkgs.stdenv.hostPlatform.system}
+    environment.systemPackages = [
-      + "/tarball/nixos-image-lxc-*-${pkgs.stdenv.hostPlatform.system}.tar.xz";
+      pkgs.wget
-    lxc-image-rootfs =
+      pkgs.dnsmasq
-      releases.containerTarball.${pkgs.stdenv.hostPlatform.system}
+    ];
-      + "/tarball/nixos-image-lxc-*-${pkgs.stdenv.hostPlatform.system}.tar.xz";
 
-  in
+    # Create user for test
-  {
+    users.users.alice = {
-    name = "lxc-container-unprivileged";
+      isNormalUser = true;
-
+      password = "test";
-    meta = {
+      description = "Lxc unprivileged user with access to lxcbr0";
-      maintainers = lib.teams.lxc.members;
+      extraGroups = [ "lxc-user" ];
+      subGidRanges = [
+        {
+          startGid = 100000;
+          count = 65536;
+        }
+      ];
+      subUidRanges = [
+        {
+          startUid = 100000;
+          count = 65536;
+        }
+      ];
     };
 
-    nodes.machine =
+    users.users.bob = {
-      { lib, pkgs, ... }:
+      isNormalUser = true;
-      {
+      password = "test";
-        virtualisation = {
+      description = "Lxc unprivileged user without access to lxcbr0";
-          diskSize = 6144;
+      subGidRanges = [
-          cores = 2;
+        {
-          memorySize = 512;
+          startGid = 100000;
-          writableStore = true;
+          count = 65536;
+        }
+      ];
+      subUidRanges = [
+        {
+          startUid = 100000;
+          count = 65536;
+        }
+      ];
+    };
+  };
 
-          lxc = {
+  testScript = ''
-            enable = true;
+    machine.wait_for_unit("lxc-net.service")
-            unprivilegedContainers = true;
-            systemConfig = ''
-              lxc.lxcpath = /tmp/lxc
-            '';
-            defaultConfig = ''
-              lxc.net.0.type = veth
-              lxc.net.0.link = lxcbr0
-              lxc.net.0.flags = up
-              lxc.net.0.hwaddr = 00:16:3e:xx:xx:xx
-              lxc.idmap = u 0 100000 65536
-              lxc.idmap = g 0 100000 65536
-            '';
-            # Permit user alice to connect to bridge
-            usernetConfig = ''
-              @lxc-user veth lxcbr0 10
-            '';
-            bridgeConfig = ''
-              LXC_IPV6_ADDR=""
-              LXC_IPV6_MASK=""
-              LXC_IPV6_NETWORK=""
-              LXC_IPV6_NAT="false"
-            '';
-          };
-        };
 
-        # Needed for lxc
+    # Copy config files for alice
-        environment.systemPackages = [
+    machine.execute("su -- alice -c 'mkdir -p ~/.config/lxc'")
-          pkgs.wget
+    machine.execute("su -- alice -c 'cp /etc/lxc/default.conf ~/.config/lxc/'")
-          pkgs.dnsmasq
+    machine.execute("su -- alice -c 'cp /etc/lxc/lxc.conf ~/.config/lxc/'")
-        ];
 
-        # Create user for test
+    machine.succeed("su -- alice -c 'lxc-create -t local -n test -- --metadata ${lxc-image-metadata} --fstree ${lxc-image-rootfs}'")
-        users.users.alice = {
+    machine.succeed("su -- alice -c 'lxc-start test'")
-          isNormalUser = true;
+    machine.succeed("su -- alice -c 'lxc-stop test'")
-          password = "test";
-          description = "Lxc unprivileged user with access to lxcbr0";
-          extraGroups = [ "lxc-user" ];
-          subGidRanges = [
-            {
-              startGid = 100000;
-              count = 65536;
-            }
-          ];
-          subUidRanges = [
-            {
-              startUid = 100000;
-              count = 65536;
-            }
-          ];
-        };
 
-        users.users.bob = {
+    # Copy config files for bob
-          isNormalUser = true;
+    machine.execute("su -- bob -c 'mkdir -p ~/.config/lxc'")
-          password = "test";
+    machine.execute("su -- bob -c 'cp /etc/lxc/default.conf ~/.config/lxc/'")
-          description = "Lxc unprivileged user without access to lxcbr0";
+    machine.execute("su -- bob -c 'cp /etc/lxc/lxc.conf ~/.config/lxc/'")
-          subGidRanges = [
-            {
-              startGid = 100000;
-              count = 65536;
-            }
-          ];
-          subUidRanges = [
-            {
-              startUid = 100000;
-              count = 65536;
-            }
-          ];
-        };
-      };
 
-    testScript = ''
+    machine.fail("su -- bob -c 'lxc-start test'")
-      machine.wait_for_unit("lxc-net.service")
+  '';
-
+}
-      # Copy config files for alice
-      machine.execute("su -- alice -c 'mkdir -p ~/.config/lxc'")
-      machine.execute("su -- alice -c 'cp /etc/lxc/default.conf ~/.config/lxc/'")
-      machine.execute("su -- alice -c 'cp /etc/lxc/lxc.conf ~/.config/lxc/'")
-
-      machine.succeed("su -- alice -c 'lxc-create -t local -n test -- --metadata ${lxc-image-metadata} --fstree ${lxc-image-rootfs}'")
-      machine.succeed("su -- alice -c 'lxc-start test'")
-      machine.succeed("su -- alice -c 'lxc-stop test'")
-
-      # Copy config files for bob
-      machine.execute("su -- bob -c 'mkdir -p ~/.config/lxc'")
-      machine.execute("su -- bob -c 'cp /etc/lxc/default.conf ~/.config/lxc/'")
-      machine.execute("su -- bob -c 'cp /etc/lxc/lxc.conf ~/.config/lxc/'")
-
-      machine.fail("su -- bob -c 'lxc-start test'")
-    '';
-  }
-)