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

use compliant machine name in installation test

Browse Source
This commit is contained in:
Jörg Thalheim
2024-08-24 11:32:40 +02:00
parent 68e1d023e9
commit 0d5aaab9d1
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,10 +10,10 @@
let let
dependencies = [ dependencies = [
pkgs.disko pkgs.disko
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.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
] ++ 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
@@ -42,7 +42,7 @@
testScript = '' testScript = ''
start_all() start_all()
machine.succeed("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; }; } { inherit pkgs self; };
}; };

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

@@ -1,14 +1,14 @@
{ self, lib, ... }: { self, lib, ... }:
{ {
clan.machines.test_install_machine = { clan.machines.test-install-machine = {
clan.core.networking.targetHost = "test_install_machine"; clan.core.networking.targetHost = "test-install-machine";
fileSystems."/".device = lib.mkDefault "/dev/vdb"; fileSystems."/".device = lib.mkDefault "/dev/vdb";
boot.loader.grub.device = lib.mkDefault "/dev/vdb"; boot.loader.grub.device = lib.mkDefault "/dev/vdb";
imports = [ self.nixosModules.test_install_machine ]; imports = [ self.nixosModules.test-install-machine ];
}; };
flake.nixosModules = { flake.nixosModules = {
test_install_machine = test-install-machine =
{ lib, modulesPath, ... }: { lib, modulesPath, ... }:
{ {
imports = [ imports = [
@@ -34,9 +34,9 @@
let let
dependencies = [ dependencies = [
self self
self.nixosConfigurations.test_install_machine.config.system.build.toplevel self.nixosConfigurations.test-install-machine.config.system.build.toplevel
self.nixosConfigurations.test_install_machine.config.system.build.diskoScript self.nixosConfigurations.test-install-machine.config.system.build.diskoScript
self.nixosConfigurations.test_install_machine.config.system.clan.deployment.file self.nixosConfigurations.test-install-machine.config.system.clan.deployment.file
pkgs.stdenv.drvPath pkgs.stdenv.drvPath
pkgs.nixos-anywhere pkgs.nixos-anywhere
] ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs); ] ++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs);
@@ -99,6 +99,7 @@
client.wait_until_succeeds("ssh -o StrictHostKeyChecking=accept-new -v root@target hostname") client.wait_until_succeeds("ssh -o StrictHostKeyChecking=accept-new -v root@target hostname")
client.succeed("clan machines install --debug --flake ${../..} --yes test_install_machine root@target >&2") client.succeed("clan machines install --debug --flake ${../..} --yes test_install_machine root@target >&2")
client.succeed("clan machines install --debug --flake ${../..} --yes test-install-machine root@target >&2")
try: try:
target.shutdown() target.shutdown()
except BrokenPipeError: except BrokenPipeError: