fricklerhandwerk/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

WIP: test data model thru VM #11

Closed
kiara wants to merge 70 commits from data-model-test-deployment-plain into deployment-data-model-with-tests
pull from: data-model-test-deployment-plain
merge into: fricklerhandwerk:deployment-data-model-with-tests
Conversation 2 Commits 70 Files changed 22 +4 -4
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit d51f8fcf16 - Show all commits

4
deployment/check/common/targetNode.nix
View file

@ -3,6 +3,7 @@
config, config,
lib, lib,
modulesPath, modulesPath,
sources,
... ...
}: }:
@ -17,7 +18,10 @@ in
imports = [ imports = [
(modulesPath + "/profiles/qemu-guest.nix") (modulesPath + "/profiles/qemu-guest.nix")
(modulesPath + "/../lib/testing/nixos-test-base.nix") (modulesPath + "/../lib/testing/nixos-test-base.nix")
"${sources.disko}/module.nix"
../../../infra/common/proxmox-qemu-vm.nix
./sharedOptions.nix ./sharedOptions.nix
../../../infra/common/nixos/users.nix
]; ];
config = mkMerge [ config = mkMerge [

4
paste
View file

@ -9,11 +9,7 @@ command=(nix-instantiate --expr '
sources = import ./npins; sources = import ./npins;
configuration = { configuration = {
imports = [ imports = [
./infra/common/proxmox-qemu-vm.nix
./infra/common/nixos/users.nix
./deployment/check/common/sharedOptions.nix
./deployment/check/common/targetNode.nix ./deployment/check/common/targetNode.nix
"${sources.disko}/module.nix"
]; ];
}; };
eval = import "${sources.nixpkgs}/nixos/lib/eval-config.nix" { eval = import "${sources.nixpkgs}/nixos/lib/eval-config.nix" {