about summary refs log tree commit diff
path: root/nixos/tests/lxd-image-server.nix
diff options
context:
space:
mode:
authorAdam Stephens <adam@valkor.net>2023-08-10 14:07:42 -0400
committerAdam Stephens <adam@valkor.net>2023-08-17 21:02:08 -0400
commitf1c0589e4c778cc5852a14c6776a7053177983c3 (patch)
treef223325b80f9ccf0b27fc8522c5d87b946fb31ea /nixos/tests/lxd-image-server.nix
parentd41c2a87e3949cbff8e3af04587bae6258ceee97 (diff)
nixos/tests/lxd: move into subdir, use minimal init, remove sleeps
Diffstat (limited to 'nixos/tests/lxd-image-server.nix')
-rw-r--r--nixos/tests/lxd-image-server.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/tests/lxd-image-server.nix b/nixos/tests/lxd-image-server.nix
index e5a292b61bd97..d0afa495a5b1d 100644
--- a/nixos/tests/lxd-image-server.nix
+++ b/nixos/tests/lxd-image-server.nix
@@ -61,14 +61,14 @@ in {
     machine.wait_for_unit("lxd.service")
     machine.wait_for_file("/var/lib/lxd/unix.socket")
 
-    # It takes additional second for lxd to settle
-    machine.sleep(1)
+    # Wait for lxd to settle
+    machine.succeed("lxd waitready")
 
     # lxd expects the pool's directory to already exist
     machine.succeed("mkdir /var/lxd-pool")
 
     machine.succeed(
-        "cat ${./common/lxd/config.yaml} | lxd init --preseed"
+        "lxd init --minimal"
     )
 
     machine.succeed(