DavHau/clan-core
1
0
Fork 0
forked from clan/clan-core
Code Pull Requests Activity

fix offline build of flash command

Browse Source
This commit is contained in:
Jörg Thalheim 2024-05-29 12:28:39 +02:00
parent 750b6aec59
commit 5c75a6490b
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
checks/flash/flake-module.nix
View File

@ -9,23 +9,17 @@
}: }:
let let
dependencies = [ dependencies = [
self
pkgs.stdenv.drvPath
pkgs.jq
pkgs.disko pkgs.disko
pkgs.stdenvNoCC.drvPath
pkgs.openssl
pkgs.curl
self.clanInternals.machines.${pkgs.hostPlatform.system}.test_install_machine.config.system.build.toplevel self.clanInternals.machines.${pkgs.hostPlatform.system}.test_install_machine.config.system.build.toplevel
self.clanInternals.machines.${pkgs.hostPlatform.system}.test_install_machine.config.system.build.diskoScript self.clanInternals.machines.${pkgs.hostPlatform.system}.test_install_machine.config.system.build.diskoScript
self.clanInternals.machines.${pkgs.hostPlatform.system}.test_install_machine.config.system.build.diskoScript.drvPath
self.clanInternals.machines.${pkgs.hostPlatform.system}.test_install_machine.config.system.clan.deployment.file self.clanInternals.machines.${pkgs.hostPlatform.system}.test_install_machine.config.system.clan.deployment.file
self.clanInternals.machines.${pkgs.hostPlatform.system}.test_install_machine.pkgs.disko
] ++ 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; };
in in
{ {
# Currently disabled... # Currently disabled...
checks = pkgs.lib.mkIf (false && pkgs.stdenv.isLinux) { checks = pkgs.lib.mkIf (pkgs.stdenv.isLinux) {
flash = (import ../lib/test-base.nix) { flash = (import ../lib/test-base.nix) {
name = "flash"; name = "flash";
nodes.target = { nodes.target = {
@ -47,10 +41,8 @@
}; };
testScript = '' testScript = ''
start_all() start_all()
machine.succeed("nix-store --verify-path ${
self.clanInternals.machines.${pkgs.hostPlatform.system}.test_install_machine.config.system.build.diskoScript machine.succeed("clan flash --debug --flake ${../..} --yes --disk main /dev/vdb test_install_machine")
}")
machine.execute("timeout 30 clan flash --debug --flake ${../..} --yes --disk main /dev/vdb test_install_machine")
''; '';
} { inherit pkgs self; }; } { inherit pkgs self; };
}; };