kiara/Fediversity
1
0
Fork 0
forked from fediversity/fediversity
Code Pull requests Activity

get test to run

Browse source
This commit is contained in:
Kiara Grouwstra 2025-06-07 21:54:54 +02:00
parent 9d48f1153f
commit f52f3cb50c
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
5 changed files with 63 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
deployment/check/proxmox/flake-part.nix
View file

@ -1,17 +1,23 @@
{
inputs,
...
}:
{
perSystem =
{ pkgs, ... }:
let
inherit (pkgs) system lib;
sources = import ../../../npins;
inherit (import "${sources.flake-inputs}/lib.nix") import-flake;
inputs = lib.mapAttrs (_: import-flake) sources;
inherit (inputs) proxmox-nixos;
overlay = proxmox-nixos.overlays.${system};
pkgs' = pkgs.extend overlay;
in
{
checks.proxmox-basic = pkgs.testers.runNixOSTest {
checks.proxmox-basic = pkgs'.testers.runNixOSTest {
imports = [
./proxmoxTest.nix
];
_module.args.inputs = inputs;
_module.args = {
inherit sources inputs;
};
};
};
}

33
deployment/check/proxmox/myvm.nix Normal file
View file

@ -0,0 +1,33 @@
{
pkgs,
...
}:
let
sources = import ../../../npins;
in
{
imports = [
../../../infra/common/nixos/hardware.nix
"${sources.disko}/module.nix" # https://github.com/nix-community/disko/issues/1060
];
networking.hostName = "myvm";
virtualisation.proxmox = {
node = "myproxmoxnode";
iso = pkgs.fetchurl {
url = "https://releases.nixos.org/nixos/24.05/nixos-24.05.7139.bcba2fbf6963/nixos-minimal-24.05.7139.bcba2fbf6963-x86_64-linux.iso";
hash = "sha256-plre/mIHdIgU4xWU+9xErP+L4i460ZbcKq8iy2n4HT8=";
};
vmid = 101;
memory = 4096;
cores = 4;
sockets = 2;
net = [
{
model = "virtio";
bridge = "vmbr0";
}
];
scsi = [ { file = "local:16"; } ]; # This will create a 16GB volume in 'local'
};
}

16
deployment/check/proxmox/proxmoxTest.nix
View file

@ -1,39 +1,25 @@
{
inputs,
lib,
pkgs,
system,
inputs,
...
}:
let
# sources = import ../../../npins;
# proxmox-nixos = import sources.proxmox-nixos;
minimalIso = pkgs.fetchurl {
url = "https://releases.nixos.org/nixos/24.05/nixos-24.05.7139.bcba2fbf6963/nixos-minimal-24.05.7139.bcba2fbf6963-x86_64-linux.iso";
hash = "sha256-plre/mIHdIgU4xWU+9xErP+L4i460ZbcKq8iy2n4HT8=";
};
in
{
name = "proxmox-basic";
nodes.mypve = {
imports = [
# proxmox-nixos.nixosModules.proxmox-ve
# "${sources.proxmox-nixos}/modules/proxmox-ve"
inputs.proxmox-nixos.nixosModules.proxmox-ve
];
nixpkgs.overlays = lib.mkForce [
# proxmox-nixos.overlays.x86_64-linux
# (import "${sources.proxmox-nixos}/pkgs" { inherit pkgs; pkgs-unstable = pkgs; craneLib = pkgs.callPackage "${sources.crane}/lib" { }; })
inputs.proxmox-nixos.overlays.${system}
];
services.proxmox-ve = {
enable = true;
# package = pkgs.callPackage "${sources.proxmox-nixos}/pkgs/proxmox-ve" { };
ipAddress = "192.168.1.1";
vms = {
myvm1 = {

53
myvm.nix
View file

@ -1,53 +0,0 @@
{
pkgs,
lib,
inputs,
system,
...
}:
let
sources = import ./npins;
# pkgs = import sources.nixpkgs { inherit system; };
# pkgs = import sources.nixpkgs { };
# pkgs = import inputs.nixpkgs { };
# proxmox-nixos = import sources.proxmox-nixos;
in
{
# error: The option `virtualisation.proxmox' does not exist
imports = [
(import "${sources.disko}/module.nix")
./infra/common/nixos/hardware.nix
# proxmox-nixos.nixosModules.proxmox-ve # error: 'builtins.storePath' is not allowed in pure evaluation mode
# "${sources.proxmox-nixos}/modules/proxmox-ve"
inputs.proxmox-nixos.nixosModules.proxmox-ve
];
nixpkgs.overlays = lib.mkForce [
# proxmox-nixos.overlays.x86_64-linux # error: 'builtins.storePath' is not allowed in pure evaluation mode
# (import "${sources.proxmox-nixos}/pkgs" {
# inherit pkgs;
# pkgs-unstable = pkgs;
# craneLib = pkgs.callPackage "${sources.crane}/lib" { };
# })
inputs.proxmox-nixos.overlays.${system}
];
networking.hostName = "myvm";
virtualisation.proxmox = {
node = "myproxmoxnode";
iso = pkgs.fetchurl {
url = "https://releases.nixos.org/nixos/24.05/nixos-24.05.7139.bcba2fbf6963/nixos-minimal-24.05.7139.bcba2fbf6963-x86_64-linux.iso";
hash = "sha256-plre/mIHdIgU4xWU+9xErP+L4i460ZbcKq8iy2n4HT8=";
};
vmid = 101;
memory = 4096;
cores = 4;
sockets = 2;
net = [
{
model = "virtio";
bridge = "vmbr0";
}
];
scsi = [ { file = "local:16"; } ]; # This will create a 16GB volume in 'local'
};
}

19
npins/sources.json
View file

@ -57,6 +57,19 @@
"url": "https://api.github.com/repos/nix-community/disko/tarball/v1.12.0",
"hash": "0wbx518d2x54yn4xh98cgm65wvj0gpy6nia6ra7ns4j63hx14fkq"
},
"flake-inputs": {
"type": "Git",
"repository": {
"type": "GitHub",
"owner": "fricklerhandwerk",
"repo": "flake-inputs"
},
"branch": "main",
"submodules": false,
"revision": "6461d0b56e790bf289af07c5e5261abbf4f536af",
"url": "https://github.com/fricklerhandwerk/flake-inputs/archive/6461d0b56e790bf289af07c5e5261abbf4f536af.tar.gz",
"hash": "03mwisvr1mc3nd33nvg4bvcyxjxpm4lwhwym39r0768cm1007ixl"
},
"flake-parts": {
"type": "Git",
"repository": {
@ -147,9 +160,9 @@
},
"branch": "main",
"submodules": false,
"revision": "bda8df28b6656843e459f166b04bc291bc495a29",
"url": "https://github.com/SaumonNet/proxmox-nixos/archive/bda8df28b6656843e459f166b04bc291bc495a29.tar.gz",
"hash": "02yhq6gk3pva7pzhgypdnsfl1wyy8yrwwhll05x92ywzkqc0if99"
"revision": "48f39fbe2e8f90f9ac160dd4b6929f3ac06d8223",
"url": "https://github.com/SaumonNet/proxmox-nixos/archive/48f39fbe2e8f90f9ac160dd4b6929f3ac06d8223.tar.gz",
"hash": "0606qcs8x1jwckd1ivf52rqdmi3lkn66iiqh6ghd4kqx0g2bw3nv"
}
},
"version": 5