From c9e5afc11b6225a3b871dd47dca16aed02a471bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20N=C3=BCtzi?= Date: Sat, 20 Dec 2025 12:24:54 +0100 Subject: [PATCH] gitlab: fix VM tests --- 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 8ab11239fadf..cb7282078499 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/default.nix { + gitlab = import ./gitlab { inherit runTest; }; gitolite = runTest ./gitolite.nix; diff --git a/nixos/tests/gitlab/gitlab.nix b/nixos/tests/gitlab/gitlab.nix index bd74f2345871..762d0a572854 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 ];