Unverified Commit 835ae0f7 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 41845d16 22060816

nixos/doc/manual/release-notes/rl-2505.section.md

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->



- Create the first release note entry in this section!

- The default PHP version has been updated to 8.3.



<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

nixos/modules/services/web-apps/castopod.nix

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ let 
  user = "castopod";



  # https://docs.castopod.org/getting-started/install.html#requirements

  phpPackage = pkgs.php.withExtensions ({ enabled, all }: with all; [

  phpPackage = pkgs.php82.withExtensions ({ enabled, all }: with all; [

    intl

    curl

    mbstring

nixos/tests/incus/container.nix

+9 −1
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ in 
    networking.nftables.enable = true;

  };



  testScript = ''

  testScript = # python

  ''

    def instance_is_up(_) -> bool:

        status, _ = machine.execute("incus exec container --disable-stdin --force-interactive /run/current-system/sw/bin/systemctl -- is-system-running")

        return status == 0
@@ -94,6 +95,13 @@ in 
            meminfo_bytes = " ".join(meminfo.split(' ')[-2:])

            assert meminfo_bytes == "125000 kB", f"Wrong amount of memory reported from /proc/meminfo, want: '125000 kB', got: '{meminfo_bytes}'"



    with subtest("virtual tpm can be configured"):

        machine.succeed("incus config device add container vtpm tpm path=/dev/tpm0 pathrm=/dev/tpmrm0")

        machine.succeed("incus exec container -- test -e /dev/tpm0")

        machine.succeed("incus exec container -- test -e /dev/tpmrm0")

        machine.succeed("incus config device remove container vtpm")

        machine.fail("incus exec container -- test -e /dev/tpm0")



    with subtest("lxc-generator"):

        with subtest("lxc-container generator configures plain container"):

            # reuse the existing container to save some time

nixos/tests/incus/storage.nix

+64 −34
Original line number Diff line number Diff line
@@ -13,17 +13,25 @@ import ../make-test-python.nix ( 
      maintainers = lib.teams.lxc.members;

    };



    nodes.machine =

      { lib, ... }:

      {

    nodes.machine = {

      boot.supportedFilesystems = [ "zfs" ];

      boot.zfs.forceImportRoot = false;



      environment.systemPackages = [ pkgs.parted ];



      networking.hostId = "01234567";

      networking.nftables.enable = true;



      services.lvm = {

        boot.thin.enable = true;

        dmeventd.enable = true;

      };



      virtualisation = {

          emptyDiskImages = [ 2048 ];

        emptyDiskImages = [

          2048

          2048

        ];

        incus = {

          enable = true;

          package = incus;
@@ -31,7 +39,8 @@ import ../make-test-python.nix ( 
      };

    };



    testScript = ''

    testScript = # python

      ''

        machine.wait_for_unit("incus.service")



        with subtest("Verify zfs pool created and usable"):
@@ -43,12 +52,33 @@ import ../make-test-python.nix ( 


            machine.succeed("incus storage create zfs_pool zfs source=zfs_pool/incus")

            machine.succeed("zfs list zfs_pool/incus")



            machine.succeed("incus storage volume create zfs_pool test_fs --type filesystem")

            machine.succeed("incus storage volume create zfs_pool test_vol --type block")



            machine.succeed("incus storage show zfs_pool")

            machine.succeed("incus storage volume list zfs_pool")

            machine.succeed("incus storage volume show zfs_pool test_fs")

            machine.succeed("incus storage volume show zfs_pool test_vol")



            machine.succeed("incus create zfs1 --empty --storage zfs_pool")

            machine.succeed("incus list zfs1")



        with subtest("Verify lvm pool created and usable"):

            machine.succeed("incus storage create lvm_pool lvm source=/dev/vdc lvm.vg_name=incus_pool")

            machine.succeed("vgs incus_pool")



            machine.succeed("incus storage volume create lvm_pool test_fs --type filesystem")

            machine.succeed("incus storage volume create lvm_pool test_vol --type block")



            machine.succeed("incus storage show lvm_pool")



            machine.succeed("incus storage volume list lvm_pool")

            machine.succeed("incus storage volume show lvm_pool test_fs")

            machine.succeed("incus storage volume show lvm_pool test_vol")



            machine.succeed("incus create lvm1 --empty --storage zfs_pool")

            machine.succeed("incus list lvm1")

      '';

  }

)

nixos/tests/incus/virtual-machine.nix

+2 −4
Original line number Diff line number Diff line
@@ -30,9 +30,6 @@ in 
      memorySize = 1024;

      diskSize = 4096;



      # Provide a TPM to test vTPM support for guests

      tpm.enable = true;



      incus = {

        enable = true;

        package = incus;
@@ -41,7 +38,8 @@ in 
    networking.nftables.enable = true;

  };



  testScript = ''

  testScript = # python

  ''

    def instance_is_up(_) -> bool:

      status, _ = machine.execute("incus exec ${instance-name} --disable-stdin --force-interactive /run/current-system/sw/bin/systemctl -- is-system-running")

      return status == 0