pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #231246 from yayayayaka/gitlab-test-fix-warning

nixosTests.gitlab: Use module system based runner

authored by Robert Hensing and committed by GitHub f212785e eed2172f

+11 -8
unified split
+1 -1
nixos/tests/all-tests.nix
··· 267 267 gitdaemon = handleTest ./gitdaemon.nix {}; 268 268 gitea = handleTest ./gitea.nix { giteaPackage = pkgs.gitea; }; 269 269 github-runner = handleTest ./github-runner.nix {}; 270 - gitlab = handleTest ./gitlab.nix {}; 270 + gitlab = runTest ./gitlab.nix; 271 271 gitolite = handleTest ./gitolite.nix {}; 272 272 gitolite-fcgiwrap = handleTest ./gitolite-fcgiwrap.nix {}; 273 273 glusterfs = handleTest ./glusterfs.nix {};
+10 -7
nixos/tests/gitlab.nix
··· 6 6 # - Creating Merge Requests and merging them 7 7 # - Opening and closing issues. 8 8 # - Downloading repository archives as tar.gz and tar.bz2 9 - import ./make-test-python.nix ({ pkgs, lib, ... }: 9 + # Run with 10 + # [nixpkgs]$ nix-build -A nixosTests.gitlab 11 + 12 + { pkgs, lib, ... }: 10 13 11 14 with lib; 12 15 ··· 174 177 gitlab.wait_for_unit("gitlab.service") 175 178 gitlab.wait_for_unit("gitlab-pages.service") 176 179 gitlab.wait_for_unit("gitlab-sidekiq.service") 177 - gitlab.wait_for_file("${nodes.gitlab.config.services.gitlab.statePath}/tmp/sockets/gitlab.socket") 180 + gitlab.wait_for_file("${nodes.gitlab.services.gitlab.statePath}/tmp/sockets/gitlab.socket") 178 181 gitlab.wait_until_succeeds("curl -sSf http://gitlab/users/sign_in") 179 182 ''; 180 183 ··· 419 422 + '' 420 423 gitlab.systemctl("start gitlab-backup.service") 421 424 gitlab.wait_for_unit("gitlab-backup.service") 422 - gitlab.wait_for_file("${nodes.gitlab.config.services.gitlab.statePath}/backup/dump_gitlab_backup.tar") 425 + gitlab.wait_for_file("${nodes.gitlab.services.gitlab.statePath}/backup/dump_gitlab_backup.tar") 423 426 gitlab.systemctl("stop postgresql.service gitlab.target") 424 427 gitlab.succeed( 425 - "find ${nodes.gitlab.config.services.gitlab.statePath} -mindepth 1 -maxdepth 1 -not -name backup -execdir rm -r {} +" 428 + "find ${nodes.gitlab.services.gitlab.statePath} -mindepth 1 -maxdepth 1 -not -name backup -execdir rm -r {} +" 426 429 ) 427 430 gitlab.succeed("systemd-tmpfiles --create") 428 - gitlab.succeed("rm -rf ${nodes.gitlab.config.services.postgresql.dataDir}") 431 + gitlab.succeed("rm -rf ${nodes.gitlab.services.postgresql.dataDir}") 429 432 gitlab.systemctl("start gitlab-config.service gitaly.service gitlab-postgresql.service") 430 - gitlab.wait_for_file("${nodes.gitlab.config.services.gitlab.statePath}/tmp/sockets/gitaly.socket") 433 + gitlab.wait_for_file("${nodes.gitlab.services.gitlab.statePath}/tmp/sockets/gitaly.socket") 431 434 gitlab.succeed( 432 435 "sudo -u gitlab -H gitlab-rake gitlab:backup:restore RAILS_ENV=production BACKUP=dump force=yes" 433 436 ) ··· 435 438 '' 436 439 + waitForServices 437 440 + test false; 438 - }) 441 + }