Revert "nginx.tests: migrate most to nspawn containers"

nixos/tests/nginx-auth.nix

@@ -1,7 +1,8 @@
+{ pkgs, ... }:
 {
   name = "nginx-auth";
 
-  containers = {
+  nodes = {
     webserver =
       { pkgs, lib, ... }:
       {

nixos/tests/nginx-etag-compression.nix

@@ -2,7 +2,7 @@
 {
   name = "nginx-etag-compression";
 
-  containers.machine =
+  nodes.machine =
     { pkgs, lib, ... }:
     {
       services.nginx = {
@@ -28,7 +28,7 @@
     };
 
   testScript =
-    { containers, ... }:
+    { nodes, ... }:
     ''
       machine.wait_for_unit("nginx")
       machine.wait_for_open_port(80)

nixos/tests/nginx-globalredirect.nix

@@ -2,7 +2,7 @@
 {
   name = "nginx-globalredirect";
 
-  containers = {
+  nodes = {
     webserver =
       { pkgs, lib, ... }:
       {

nixos/tests/nginx-http3.nix

@@ -13,7 +13,7 @@ builtins.listToAttrs (
         name = "nginx-http3-${pkgs.lib.getName nginxPackage}";
         meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];
 
-        containers = {
+        nodes = {
           server =
             { lib, pkgs, ... }:
             {

nixos/tests/nginx-lua.nix

@@ -4,7 +4,7 @@
 
   meta.maintainers = [ lib.maintainers.kranzes ];
 
-  containers.machine = {
+  nodes.machine = {
     services.nginx = {
       enable = true;
       lua = {

nixos/tests/nginx-mime.nix

@@ -1,9 +1,9 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 {
   name = "nginx-mime";
   meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];
 
-  containers = {
+  nodes = {
     server =
       { pkgs, ... }:
       {

nixos/tests/nginx-modsecurity.nix

@@ -2,7 +2,7 @@
 {
   name = "nginx-modsecurity";
 
-  containers.machine =
+  nodes.machine =
     {
       config,
       lib,

nixos/tests/nginx-moreheaders.nix

@@ -2,7 +2,7 @@
 {
   name = "nginx-more-headers";
 
-  containers = {
+  nodes = {
     webserver =
       { pkgs, ... }:
       {

nixos/tests/nginx-njs.nix

@@ -1,7 +1,8 @@
+{ pkgs, lib, ... }:
 {
   name = "nginx-njs";
 
-  containers.machine =
+  nodes.machine =
     {
       config,
       lib,

nixos/tests/nginx-pubhtml.nix

@@ -2,7 +2,7 @@
 {
   name = "nginx-pubhtml";
 
-  containers.machine =
+  nodes.machine =
     { pkgs, ... }:
     {
       systemd.services.nginx.serviceConfig.ProtectHome = "read-only";

nixos/tests/nginx-redirectcode.nix

@@ -3,7 +3,7 @@
   name = "nginx-redirectcode";
   meta.maintainers = with lib.maintainers; [ misterio77 ];
 
-  containers = {
+  nodes = {
     webserver =
       { pkgs, lib, ... }:
       {

nixos/tests/nginx-sso.nix

@@ -5,7 +5,7 @@
     maintainers = with pkgs.lib.maintainers; [ ambroisie ];
   };
 
-  containers.machine = {
+  nodes.machine = {
     services.nginx.sso = {
       enable = true;
       configuration = {

nixos/tests/nginx-status-page.nix

@@ -5,13 +5,12 @@
     maintainers = [ h7x4 ];
   };
 
-  containers = {
+  nodes = {
     webserver =
       { ... }:
       {
         virtualisation.vlans = [ 1 ];
 
-        services.resolved.enable = false;
         networking = {
           useNetworkd = true;
           useDHCP = false;
@@ -37,7 +36,6 @@
       {
         virtualisation.vlans = [ 1 ];
 
-        services.resolved.enable = false;
         networking = {
           useNetworkd = true;
           useDHCP = false;

nixos/tests/nginx-tmpdir.nix

@@ -5,7 +5,7 @@ in
 {
   name = "nginx-tmpdir";
 
-  containers.machine =
+  nodes.machine =
     { pkgs, ... }:
     {
       environment.etc."tmpfiles.d/nginx-uploads.conf".text = "d ${dst-dir} 0755 nginx nginx 1d";

nixos/tests/nginx-unix-socket.nix

@@ -6,7 +6,7 @@ in
 {
   name = "nginx-unix-socket";
 
-  containers = {
+  nodes = {
     webserver =
       { pkgs, lib, ... }:
       {

nixos/tests/nginx-variants.nix

@@ -1,4 +1,4 @@
-{ runTest, ... }:
+{ pkgs, runTest, ... }:
 builtins.listToAttrs (
   map
     (packageName: {
@@ -6,7 +6,7 @@ builtins.listToAttrs (
       value = runTest {
         name = "nginx-variant-${packageName}";
 
-        containers.machine =
+        nodes.machine =
           { pkgs, ... }:
           {
             services.nginx = {