diff --git a/checks/flash/flake-module.nix b/checks/flash/flake-module.nix index d0164224..5d8a5ae2 100644 --- a/checks/flash/flake-module.nix +++ b/checks/flash/flake-module.nix @@ -9,23 +9,17 @@ }: let dependencies = [ - self - pkgs.stdenv.drvPath - pkgs.jq 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.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.pkgs.disko ] ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs); closureInfo = pkgs.closureInfo { rootPaths = dependencies; }; in { # Currently disabled... - checks = pkgs.lib.mkIf (false && pkgs.stdenv.isLinux) { + checks = pkgs.lib.mkIf (pkgs.stdenv.isLinux) { flash = (import ../lib/test-base.nix) { name = "flash"; nodes.target = { @@ -47,10 +41,8 @@ }; testScript = '' start_all() - machine.succeed("nix-store --verify-path ${ - self.clanInternals.machines.${pkgs.hostPlatform.system}.test_install_machine.config.system.build.diskoScript - }") - machine.execute("timeout 30 clan flash --debug --flake ${../..} --yes --disk main /dev/vdb test_install_machine") + + machine.succeed("clan flash --debug --flake ${../..} --yes --disk main /dev/vdb test_install_machine") ''; } { inherit pkgs self; }; };