Commit 7b602cff authored by K900's avatar K900
Browse files

nixos/tests/installer: avoid create_machine, clean up 

- use normal VM nodes for target, with some extra trickery
- rename preBootCommands to postBootCommands to match its actual intent
- rename VMs to installer and target, so they're not all called machine
- set platforms on non-UEFI tests properly
- add missing packages for systemd-boot test
- fix initrd secrets leaking into the store and having wrong paths
parent ee457b8b

nixos/lib/testing/meta.nix

+7 −0
Original line number Diff line number Diff line
@@ -34,6 +34,13 @@ in 
              Sets the [`meta.broken`](https://nixos.org/manual/nixpkgs/stable/#var-meta-broken) attribute on the [{option}`test`](#test-opt-test) derivation.

            '';

          };

          platforms = lib.mkOption {

            type = types.listOf types.raw;

            default = lib.platforms.linux;

            description = ''

              Sets the [`meta.platforms`](https://nixos.org/manual/nixpkgs/stable/#var-meta-platforms) attribute on the [{option}`test`](#test-opt-test) derivation.

            '';

          };

        };

      };

      default = {};

nixos/modules/virtualisation/qemu-vm.nix

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ let 
        NIX_EFI_VARS=$(readlink -f "''${NIX_EFI_VARS:-${config.system.name}-efi-vars.fd}")

        # VM needs writable EFI vars

        if ! test -e "$NIX_EFI_VARS"; then

        ${if cfg.useBootLoader then

        ${if cfg.useBootLoader && cfg.useDefaultFilesystems then

            # We still need the EFI var from the make-disk-image derivation

            # because our "switch-to-configuration" process might

            # write into it and we want to keep this data.

nixos/tests/installer.nix

+188 −214

File changed.

Preview size limit exceeded, changes collapsed.