- auto

deployment/check/data-model/nixosTest.nix

@@ -25,16 +25,12 @@ in
 
       environment.systemPackages = with pkgs; [
         jq
-        automake
-        autoconf
       ];
 
       # FIXME: sad times
       system.extraDependencies = with pkgs; [
         jq
         jq.inputDerivation
-        automake
-        autoconf
       ];
 
       system.extraDependenciesFromModule =
@@ -42,18 +38,16 @@ in
         {
           environment.systemPackages = with pkgs; [
             hello
-            automake
-            autoconf
           ];
         };
     };
 
   extraTestScript = ''
-    with subtest("Check the status before deployment"):
-      hello.fail("hello 1>&2")
-
     ${lib.concatStringsSep "\n" (
       lib.lists.map (nodeName: ''
+        with subtest("Check the status before deployment"):
+          ${nodeName}.fail("${nodeName} 1>&2")
+
         with subtest("Run the deployment for ${nodeName}"):
           deployer.succeed("""
             set -euo pipefail
@@ -77,8 +71,6 @@ in
 
                   environment.systemPackages = with pkgs; [
                     hello
-                    automake
-                    autoconf
                   ];
                 };
               in
@@ -96,7 +88,6 @@ in
             eval "export $(echo $json | jq -r 'to_entries | map("\(.key)=\(.value)") | @sh')"
             host="root@${nodeName}"
             sshOpts=(
-              -o BatchMode=yes
               -o StrictHostKeyChecking=no
               -o "ConnectTimeout=1"
               -o "ServerAliveInterval=1"