yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'Fix broken installation tests' (#3055) from ci into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3055
This commit is contained in:
Mic92
2025-03-18 12:49:14 +00:00
parent 6162b82adb 1736b0f539
commit 3a9f0eb608
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
checks/installation-without-system/flake-module.nix
View File

@@ -117,6 +117,11 @@
pkgs.bubblewrap pkgs.bubblewrap
] ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs); ] ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs);
closureInfo = pkgs.closureInfo { rootPaths = dependencies; }; closureInfo = pkgs.closureInfo { rootPaths = dependencies; };
# with nix 2.24 we get:
# vm-test-run-test-installation> client # error: sized: unexpected end-of-file
# vm-test-run-test-installation> client # error: unexpected end-of-file
# This seems to be fixed with nix 2.26
nixPackage = pkgs.nixVersions.nix_2_26;
in in
{ {
# On aarch64-linux, hangs on reboot with after installation: # On aarch64-linux, hangs on reboot with after installation:
@@ -135,6 +140,7 @@
services.openssh.enable = true; services.openssh.enable = true;
virtualisation.diskImage = "./target.qcow2"; virtualisation.diskImage = "./target.qcow2";
virtualisation.useBootLoader = true; virtualisation.useBootLoader = true;
nix.package = nixPackage;
# virtualisation.fileSystems."/" = { # virtualisation.fileSystems."/" = {
# device = "/dev/disk/by-label/this-is-not-real-and-will-never-be-used"; # device = "/dev/disk/by-label/this-is-not-real-and-will-never-be-used";
@@ -156,6 +162,7 @@
virtualisation.rootDevice = "/dev/vdb"; virtualisation.rootDevice = "/dev/vdb";
# both installer and target need to use the same diskImage # both installer and target need to use the same diskImage
virtualisation.diskImage = "./target.qcow2"; virtualisation.diskImage = "./target.qcow2";
nix.package = nixPackage;
nix.settings = { nix.settings = {
substituters = lib.mkForce [ ]; substituters = lib.mkForce [ ];
hashed-mirrors = null; hashed-mirrors = null;
@@ -174,6 +181,7 @@
] ++ self.packages.${pkgs.system}.clan-cli.runtimeDependencies; ] ++ self.packages.${pkgs.system}.clan-cli.runtimeDependencies;
environment.etc."install-closure".source = "${closureInfo}/store-paths"; environment.etc."install-closure".source = "${closureInfo}/store-paths";
virtualisation.memorySize = 2048; virtualisation.memorySize = 2048;
nix.package = nixPackage;
nix.settings = { nix.settings = {
substituters = lib.mkForce [ ]; substituters = lib.mkForce [ ];
hashed-mirrors = null; hashed-mirrors = null;

9
checks/installation/flake-module.nix
View File

@@ -98,6 +98,12 @@
pkgs.bubblewrap pkgs.bubblewrap
] ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs); ] ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs);
closureInfo = pkgs.closureInfo { rootPaths = dependencies; }; closureInfo = pkgs.closureInfo { rootPaths = dependencies; };
# with nix 2.24 we get:
# vm-test-run-test-installation> client # error: sized: unexpected end-of-file
# vm-test-run-test-installation> client # error: unexpected end-of-file
# This seems to be fixed with nix 2.26
nixPackage = pkgs.nixVersions.nix_2_26;
in in
{ {
# On aarch64-linux, hangs on reboot with after installation: # On aarch64-linux, hangs on reboot with after installation:
@@ -116,6 +122,7 @@
services.openssh.enable = true; services.openssh.enable = true;
virtualisation.diskImage = "./target.qcow2"; virtualisation.diskImage = "./target.qcow2";
virtualisation.useBootLoader = true; virtualisation.useBootLoader = true;
nix.package = nixPackage;
# virtualisation.fileSystems."/" = { # virtualisation.fileSystems."/" = {
# device = "/dev/disk/by-label/this-is-not-real-and-will-never-be-used"; # device = "/dev/disk/by-label/this-is-not-real-and-will-never-be-used";
@@ -137,6 +144,7 @@
virtualisation.rootDevice = "/dev/vdb"; virtualisation.rootDevice = "/dev/vdb";
# both installer and target need to use the same diskImage # both installer and target need to use the same diskImage
virtualisation.diskImage = "./target.qcow2"; virtualisation.diskImage = "./target.qcow2";
nix.package = nixPackage;
nix.settings = { nix.settings = {
substituters = lib.mkForce [ ]; substituters = lib.mkForce [ ];
hashed-mirrors = null; hashed-mirrors = null;
@@ -155,6 +163,7 @@
] ++ self.packages.${pkgs.system}.clan-cli.runtimeDependencies; ] ++ self.packages.${pkgs.system}.clan-cli.runtimeDependencies;
environment.etc."install-closure".source = "${closureInfo}/store-paths"; environment.etc."install-closure".source = "${closureInfo}/store-paths";
virtualisation.memorySize = 2048; virtualisation.memorySize = 2048;
nix.package = nixPackage;
nix.settings = { nix.settings = {
substituters = lib.mkForce [ ]; substituters = lib.mkForce [ ];
hashed-mirrors = null; hashed-mirrors = null;

3
checks/lib/minify.nix
View File

@@ -1,7 +1,8 @@
{ lib, ... }:
{ {
nixpkgs.flake.setFlakeRegistry = false; nixpkgs.flake.setFlakeRegistry = false;
nixpkgs.flake.setNixPath = false; nixpkgs.flake.setNixPath = false;
nix.registry.nixpkgs.to = { }; nix.registry = lib.mkForce { };
documentation.doc.enable = false; documentation.doc.enable = false;
documentation.man.enable = false; documentation.man.enable = false;
} }