0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 14:10:33 +03:00

nixosTests.cloud-init: handleTest -> runTest

This commit is contained in:
Sizhe Zhao 2025-06-07 19:48:48 +08:00
parent 950a25abb6
commit 3faac88ef3
No known key found for this signature in database
GPG key ID: ED1807251A7DA08F
2 changed files with 16 additions and 25 deletions

View file

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

View file

@ -1,11 +1,4 @@
{
system ? builtins.currentSystem,
config ? { },
pkgs ? import ../.. { inherit system config; },
}:
with import ../lib/testing-python.nix { inherit system pkgs; };
with pkgs.lib;
{ lib, pkgs, ... }:
let
inherit (import ./ssh-keys.nix pkgs)
@ -61,27 +54,25 @@ let
};
in
makeTest {
{
name = "cloud-init";
meta.maintainers = with pkgs.lib.maintainers; [
meta.maintainers = with lib.maintainers; [
lewo
illustris
];
nodes.machine =
{ ... }:
{
virtualisation.qemu.options = [
"-cdrom"
"${metadataDrive}/metadata.iso"
];
services.cloud-init = {
enable = true;
network.enable = true;
};
services.openssh.enable = true;
networking.hostName = "";
networking.useDHCP = false;
nodes.machine = {
virtualisation.qemu.options = [
"-cdrom"
"${metadataDrive}/metadata.iso"
];
services.cloud-init = {
enable = true;
network.enable = true;
};
services.openssh.enable = true;
networking.hostName = "";
networking.useDHCP = false;
};
testScript = ''
# To wait until cloud-init terminates its run
unnamed.wait_for_unit("cloud-init-local.service")