nixosTests.cloud-init-hostname: handleTest -> runTest

This commit is contained in:
Sizhe Zhao 2025-06-07 20:01:14 +08:00
parent 3faac88ef3
commit 501fabc856
No known key found for this signature in database
GPG Key ID: ED1807251A7DA08F
2 changed files with 7 additions and 18 deletions

View File

@ -319,7 +319,7 @@ in
clatd = runTest ./clatd.nix; clatd = runTest ./clatd.nix;
clickhouse = import ./clickhouse { inherit runTest; }; clickhouse = import ./clickhouse { inherit runTest; };
cloud-init = runTest ./cloud-init.nix; cloud-init = runTest ./cloud-init.nix;
cloud-init-hostname = handleTest ./cloud-init-hostname.nix { }; cloud-init-hostname = runTest ./cloud-init-hostname.nix;
cloudlog = runTest ./cloudlog.nix; cloudlog = runTest ./cloudlog.nix;
cntr = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./cntr.nix { }; cntr = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./cntr.nix { };
cockpit = runTest ./cockpit.nix; cockpit = runTest ./cockpit.nix;

View File

@ -1,12 +1,4 @@
{ { lib, pkgs, ... }:
system ? builtins.currentSystem,
config ? { },
pkgs ? import ../.. { inherit system config; },
}:
with import ../lib/testing-python.nix { inherit system pkgs; };
with pkgs.lib;
let let
# Hostname can also be set through "hostname" in user-data. # Hostname can also be set through "hostname" in user-data.
# This is how proxmox configures hostname through cloud-init. # This is how proxmox configures hostname through cloud-init.
@ -27,16 +19,13 @@ let
${pkgs.cdrkit}/bin/genisoimage -volid cidata -joliet -rock -o $out/metadata.iso $out/iso ${pkgs.cdrkit}/bin/genisoimage -volid cidata -joliet -rock -o $out/metadata.iso $out/iso
''; '';
}; };
in in
makeTest { {
name = "cloud-init-hostname"; name = "cloud-init-hostname";
meta = with pkgs.lib.maintainers; { meta.maintainers = with lib.maintainers; [
maintainers = [
lewo lewo
illustris illustris
]; ];
};
nodes.machine2 = nodes.machine2 =
{ ... }: { ... }: