emily/nixos-images
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

actually including nixos-facter + nixos test

Browse source
This commit is contained in:
Jörg Thalheim 2024-09-24 18:00:35 +02:00 committed by mergify[bot]
parent 1420644027
commit 8650b1df8f
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nix/installer.nix
View file

@ -34,7 +34,7 @@
# for copying extra files of nixos-anywhere # for copying extra files of nixos-anywhere
pkgs.rsync pkgs.rsync
# alternative to nixos-generate-config # alternative to nixos-generate-config
] ++ lib.optional (pkgs.lib.versionAtLeast lib.version "24.11") pkgs.nixos-facter; ] ++ lib.optional (pkgs ? nixos-facter) pkgs.nixos-facter;
# Don't add nixpkgs to the image to save space, for our intended use case we don't need it # Don't add nixpkgs to the image to save space, for our intended use case we don't need it
system.installer.channel.enable = false; system.installer.channel.enable = false;

7
nix/kexec-installer/test.nix
View file

@ -1,6 +1,7 @@
{ pkgs { pkgs
, lib , lib
, kexecTarball , kexecTarball
, nixos-facter ? null
}: }:
pkgs.testers.runNixOSTest { pkgs.testers.runNixOSTest {
@ -69,6 +70,7 @@ pkgs.testers.runNixOSTest {
}; };
testScript = /*python*/ '' testScript = /*python*/ ''
import json
import time import time
import subprocess import subprocess
import socket import socket
@ -163,6 +165,11 @@ pkgs.testers.runNixOSTest {
host = ssh(["hostname"], stdout=subprocess.PIPE).stdout.strip() host = ssh(["hostname"], stdout=subprocess.PIPE).stdout.strip()
assert host == "nixos-installer", f"hostname is {host}, not nixos-installer" assert host == "nixos-installer", f"hostname is {host}, not nixos-installer"
has_nixos_facter=${if nixos-facter != null then "True" else "False"}
if has_nixos_facter == True:
data = json.loads(ssh(["nixos-facter"], stdout=subprocess.PIPE).stdout)
assert data["virtualisation"] == "kvm", f"virtualisation is {data['virtualisation']}, not kvm"
host_ed25519_after = ssh(["cat", "/etc/ssh/ssh_host_ed25519_key.pub"], stdout=subprocess.PIPE).stdout.strip() host_ed25519_after = ssh(["cat", "/etc/ssh/ssh_host_ed25519_key.pub"], stdout=subprocess.PIPE).stdout.strip()
assert host_ed25519_before == host_ed25519_after, f"'{host_ed25519_before}' != '{host_ed25519_after}'" assert host_ed25519_before == host_ed25519_after, f"'{host_ed25519_before}' != '{host_ed25519_after}'"