From 38434ea85b9572fc5dee18baa7527c3a577dcc33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20N=C3=BCtzi?= <gnuetzi@gmail.com>
Date: Fri, 21 Nov 2025 17:49:18 +0100
Subject: [PATCH] fix: disk size outside

---
 nixos/tests/gitlab/runner.nix                              | 6 +++++-
 nixos/tests/gitlab/runner/podman-runner/root/README.md     | 6 ------
 nixos/tests/gitlab/runner/podman-runner/virtualization.nix | 4 ----
 nixos/tests/gitlab/runner_test.py                          | 2 +-
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/nixos/tests/gitlab/runner.nix b/nixos/tests/gitlab/runner.nix
index 4d920e016080..285b5efbd354 100644
--- a/nixos/tests/gitlab/runner.nix
+++ b/nixos/tests/gitlab/runner.nix
@@ -62,6 +62,10 @@ in
           })
         ];
 
+        virtualisation = {
+          diskSize = 50000;
+        };
+
         # Define the Gitlab Runner.
         services.gitlab-runner = {
           enable = true;
@@ -163,7 +167,7 @@ in
       test_connection()
       test_register_runner(name="shell", tokenFile="${runnerConfigs.shell.tokenFile}")
       test_register_runner(name="podman", tokenFile="${runnerConfigs.podman.tokenFile}")
-      restart_gitlab_runner_service()
+      restart_gitlab_runner_service(runnerConfigs)
       test_runner_registered(runnerConfigs["shell"])
       test_runner_registered(runnerConfigs["podman"])
     '';
diff --git a/nixos/tests/gitlab/runner/podman-runner/root/README.md b/nixos/tests/gitlab/runner/podman-runner/root/README.md
index 9a844d036432..ccd5b0474792 100644
--- a/nixos/tests/gitlab/runner/podman-runner/root/README.md
+++ b/nixos/tests/gitlab/runner/podman-runner/root/README.md
@@ -2,9 +2,3 @@
 
 These are some files which are copied to the image in the runner needed for
 `buildah` (`podman`).
-
-## Reference
-
-```shell
-just update-root-files
-```
diff --git a/nixos/tests/gitlab/runner/podman-runner/virtualization.nix b/nixos/tests/gitlab/runner/podman-runner/virtualization.nix
index 20b61294e830..89a06023400d 100644
--- a/nixos/tests/gitlab/runner/podman-runner/virtualization.nix
+++ b/nixos/tests/gitlab/runner/podman-runner/virtualization.nix
@@ -1,9 +1,5 @@
 { lib, ... }:
 {
-  virtualisation = {
-    diskSize = 50000;
-  };
-
   virtualisation.docker = {
     enable = lib.mkForce false;
   };
diff --git a/nixos/tests/gitlab/runner_test.py b/nixos/tests/gitlab/runner_test.py
index 2eff8cb63648..fa4446414a0c 100644
--- a/nixos/tests/gitlab/runner_test.py
+++ b/nixos/tests/gitlab/runner_test.py
@@ -116,7 +116,7 @@ def test_register_runner(name: str, tokenFile: str):
 def restart_gitlab_runner_service(runnerConfigs):
     print("==> Restart Gitlab Runner")
 
-    if any([r.name == "podman" for r in runnerConfigs]):
+    if any([n == "podman" for n in runnerConfigs.keys()]):
         vms.gitlab_runner.wait_for_unit("podman-nix-daemon-container.service")
         vms.gitlab_runner.wait_for_unit("podman-podman-daemon-container.service")