Unverified Commit 3cd3d4cb authored by Gabriel Nützi's avatar Gabriel Nützi
Browse files

Revert "gitlab: fix VM tests (#472675)" 

This reverts commit 1ef95e45, reversing
changes made to aa1d9083.
parent 6608d852

nixos/tests/all-tests.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;

nixos/tests/gitlab/gitlab.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 ];