From 3cd3d4cb84e75aa9190f5afc7cc782f0babad527 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20N=C3=BCtzi?= <gabriel.nuetzi@sdsc.ethz.ch>
Date: Sat, 20 Dec 2025 18:04:02 +0100
Subject: [PATCH] Revert "gitlab: fix VM tests (#472675)"

This reverts commit 1ef95e4553b70930ecfdd5d6ca537e7526446189, reversing
changes made to aa1d90834bded5861225b9455adcbbde9cce80bf.
---
 nixos/tests/all-tests.nix     | 2 +-
 nixos/tests/gitlab/gitlab.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 7717e9ee9253..a65b27d04d27 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -643,7 +643,7 @@ in
   gitdaemon = runTest ./gitdaemon.nix;
   gitea = handleTest ./gitea.nix { giteaPackage = pkgs.gitea; };
   github-runner = runTest ./github-runner.nix;
-  gitlab = import ./gitlab {
+  gitlab = import ./gitlab/default.nix {
     inherit runTest;
   };
   gitolite = runTest ./gitolite.nix;
diff --git a/nixos/tests/gitlab/gitlab.nix b/nixos/tests/gitlab/gitlab.nix
index 762d0a572854..bd74f2345871 100644
--- a/nixos/tests/gitlab/gitlab.nix
+++ b/nixos/tests/gitlab/gitlab.nix
@@ -12,7 +12,7 @@
 { pkgs, lib, ... }:
 
 let
-  inherit (import ../ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey;
+  inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey;
   initialRootPassword = "notproduction";
   rootProjectId = "2";
 
@@ -37,7 +37,7 @@ in
     gitlab =
       { ... }:
       {
-        imports = [ ../common/user-account.nix ];
+        imports = [ common/user-account.nix ];
 
         environment.systemPackages = with pkgs; [ git ];