diff options
| author | Florian Klink <flokli@flokli.de> | 2018-11-26 18:47:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-26 18:47:14 +0100 |
| commit | 2c2ab68672a34e7c226ff0c5ecf4d2e063ac5705 (patch) | |
| tree | f5ffaeafb31a506ae671159d8134be26f7f0f474 /nixos | |
| parent | 128a446c59872f1df38070655a903b885293b995 (diff) | |
| parent | 6870eafe724a4f864ae54a5ae75cb6e00a4f76ad (diff) | |
| download | nixpkgs-2c2ab68672a34e7c226ff0c5ecf4d2e063ac5705.tar nixpkgs-2c2ab68672a34e7c226ff0c5ecf4d2e063ac5705.tar.gz nixpkgs-2c2ab68672a34e7c226ff0c5ecf4d2e063ac5705.tar.bz2 nixpkgs-2c2ab68672a34e7c226ff0c5ecf4d2e063ac5705.tar.lz nixpkgs-2c2ab68672a34e7c226ff0c5ecf4d2e063ac5705.tar.xz nixpkgs-2c2ab68672a34e7c226ff0c5ecf4d2e063ac5705.tar.zst nixpkgs-2c2ab68672a34e7c226ff0c5ecf4d2e063ac5705.zip | |
Merge pull request #50962 from flokli/gitlab-updater
gitlab: 11.4.4 -> 11.5.0
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/gitlab.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index 661caa8aa83..269da8aa215 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -16,6 +16,7 @@ import ./make-test.nix ({ pkgs, lib, ...} : with lib; { services.nginx = { enable = true; + recommendedProxySettings = true; virtualHosts = { "localhost" = { locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; @@ -75,7 +76,8 @@ import ./make-test.nix ({ pkgs, lib, ...} : with lib; { $gitlab->waitForUnit("gitlab.service"); $gitlab->waitForUnit("gitlab-sidekiq.service"); $gitlab->waitForFile("/var/gitlab/state/tmp/sockets/gitlab.socket"); - $gitlab->waitUntilSucceeds("curl -sSf http://localhost/users/sign_in"); + $gitlab->waitUntilSucceeds("curl -sSf http://gitlab/users/sign_in"); + $gitlab->succeed("curl -isSf http://gitlab | grep -i location | grep -q http://gitlab/users/sign_in"); $gitlab->succeed("${pkgs.sudo}/bin/sudo -u gitlab -H gitlab-rake gitlab:check 1>&2") ''; }) |