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

Merge pull request 'checks/backups: don't hardcode system' (#3107) from push-unpltryrzlsx into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3107
This commit is contained in:
Michael Hoang
2025-03-24 08:38:28 +00:00
parent 9671358443 82509e9d17
commit 7e07854058
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
checks/backups/flake-module.nix
View File

@@ -42,7 +42,6 @@
clan.core.networking.targetHost = "machine"; clan.core.networking.targetHost = "machine";
networking.hostName = "machine"; networking.hostName = "machine";
nixpkgs.hostPlatform = "x86_64-linux";
programs.ssh.knownHosts = { programs.ssh.knownHosts = {
machine.hostNames = [ "machine" ]; machine.hostNames = [ "machine" ];
@@ -173,10 +172,7 @@
}; };
in in
{ {
# Needs investigation on aarch64-linux checks = pkgs.lib.mkIf pkgs.stdenv.isLinux {
# vm-test-run-test-backups> qemu-kvm: No machine specified, and there is no default
# vm-test-run-test-backups> Use -machine help to list supported machines
checks = pkgs.lib.mkIf (pkgs.stdenv.isLinux && !pkgs.stdenv.isAarch64) {
test-backups = (import ../lib/container-test.nix) { test-backups = (import ../lib/container-test.nix) {
name = "test-backups"; name = "test-backups";
nodes.machine = { nodes.machine = {

2
checks/flake-module.nix
View File

@@ -50,7 +50,7 @@ in
flakeOutputs = flakeOutputs =
lib.mapAttrs' ( lib.mapAttrs' (
name: config: lib.nameValuePair "nixos-${name}" config.config.system.build.toplevel name: config: lib.nameValuePair "nixos-${name}" config.config.system.build.toplevel
) (lib.filterAttrs (n: _v: n != "test-install-machine-without-system") self.nixosConfigurations) ) (lib.filterAttrs (n: _: !lib.hasPrefix "test-" n) self.nixosConfigurations)
// lib.mapAttrs' (n: lib.nameValuePair "package-${n}") self'.packages // lib.mapAttrs' (n: lib.nameValuePair "package-${n}") self'.packages
// lib.mapAttrs' (n: lib.nameValuePair "devShell-${n}") self'.devShells // lib.mapAttrs' (n: lib.nameValuePair "devShell-${n}") self'.devShells
// lib.mapAttrs' (name: config: lib.nameValuePair "home-manager-${name}" config.activation-script) ( // lib.mapAttrs' (name: config: lib.nameValuePair "home-manager-${name}" config.activation-script) (