about summary refs log tree commit diff
path: root/nixos/tests/containers-ephemeral.nix
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2020-05-08 15:05:29 +0100
committeradisbladis <adisbladis@gmail.com>2022-04-27 18:35:08 +1200
commitf535d6f45ef9556d392de76c2dd1c26b436c4ea8 (patch)
tree043027faafb2b9d262a2ca2bb181785daab2319b /nixos/tests/containers-ephemeral.nix
parent7d9a979b2e176190caadc9d73ccc07f36b6efa91 (diff)
nixos-container: Use new configuration & state directories
We need to move NixOS containers somewhere else so these don't clash
with Podman, Skopeo & other container software in the libpod &
cri-o/cri-u/libcontainer ecosystems.

The state directory move is not strictly a requirement but is good for
consistency.
Diffstat (limited to 'nixos/tests/containers-ephemeral.nix')
-rw-r--r--nixos/tests/containers-ephemeral.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/tests/containers-ephemeral.nix b/nixos/tests/containers-ephemeral.nix
index c9fe2778cacdf..cb4b7d4eba0fd 100644
--- a/nixos/tests/containers-ephemeral.nix
+++ b/nixos/tests/containers-ephemeral.nix
@@ -33,10 +33,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
     machine.succeed("nixos-container start webserver")
 
     with subtest("Container got its own root folder"):
-        machine.succeed("ls /run/containers/webserver")
+        machine.succeed("ls /run/nixos-containers/webserver")
 
     with subtest("Container persistent directory is not created"):
-        machine.fail("ls /var/lib/containers/webserver")
+        machine.fail("ls /var/lib/nixos-containers/webserver")
 
     # Since "start" returns after the container has reached
     # multi-user.target, we should now be able to access it.
@@ -49,6 +49,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
         machine.fail(f"curl --fail --connect-timeout 2 http://{ip}/ > /dev/null")
 
     with subtest("Container's root folder was removed"):
-        machine.fail("ls /run/containers/webserver")
+        machine.fail("ls /run/nixos-containers/webserver")
   '';
 })