diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-11 09:10:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-11 09:10:58 +0300 |
| commit | f31ef3fd5548f9ffd5740b6aaca8672c27e34b42 (patch) | |
| tree | 9f270beb0c4cad85b2a50eb25eb6712966cd1ddf /scripts/gitaly-test-spawn | |
| parent | f60515eae2fc00c56742462826ae00826eb8826e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/gitaly-test-spawn')
| -rwxr-xr-x | scripts/gitaly-test-spawn | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/scripts/gitaly-test-spawn b/scripts/gitaly-test-spawn index 3bf2de76760..e7e25a217b2 100755 --- a/scripts/gitaly-test-spawn +++ b/scripts/gitaly-test-spawn @@ -9,8 +9,17 @@ class GitalyTestSpawn include GitalySetup def run - install_gitaly_gems - spawn_gitaly + set_bundler_config + install_gitaly_gems if ENV['CI'] + check_gitaly_config! + + # # Uncomment line below to see all gitaly logs merged into CI trace + # spawn('sleep 1; tail -f log/gitaly-test.log') + + # In local development this pid file is used by rspec. + IO.write(File.expand_path('../tmp/tests/gitaly.pid', __dir__), start_gitaly) + IO.write(File.expand_path('../tmp/tests/gitaly2.pid', __dir__), start_gitaly2) + IO.write(File.expand_path('../tmp/tests/praefect.pid', __dir__), start_praefect) end end |