about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-03-03 12:01:17 +0000
committerGitHub <noreply@github.com>2024-03-03 12:01:17 +0000
commit0d466b7ac7d51fff3fd0c4f2d0eea6d58477cd81 (patch)
tree2fdd6dda98aaf31ed967babab6f5f972c0de9ba3 /nixos
parent6a2985393fcc1dfabc6d36af148ca761a807e002 (diff)
parent5cb92fd712e859518cd17f2e230a013ded5dabb7 (diff)
Merge master into staging-next
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/minio.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix
index ece4864f771c0..67eb0cd884400 100644
--- a/nixos/tests/minio.nix
+++ b/nixos/tests/minio.nix
@@ -43,17 +43,17 @@ import ./make-test-python.nix ({ pkgs, ... }:
 
         # Minio requires at least 1GiB of free disk space to run.
         virtualisation.diskSize = 4 * 1024;
+
+        # Minio pre allocates 2GiB or memory, reserve some more
+        virtualisation.memorySize = 4096;
       };
     };
 
     testScript = ''
-      import time
 
       start_all()
       # simulate manually editing root credentials file
       machine.wait_for_unit("multi-user.target")
-      machine.copy_from_host("${credsPartial}", "${rootCredentialsFile}")
-      time.sleep(3)
       machine.copy_from_host("${credsFull}", "${rootCredentialsFile}")
 
       machine.wait_for_unit("minio.service")