diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-18 21:11:20 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-18 21:11:20 +0300 |
commit | b53f92660977ebc05433e9bbeb74e3c4c6bf0194 (patch) | |
tree | 9182728ebbbc96b7511918c288a2995055bea1c8 /scripts/gitaly-test-spawn | |
parent | da975941d13188324266a50d3f8c0292690ee437 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/gitaly-test-spawn')
-rwxr-xr-x | scripts/gitaly-test-spawn | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/scripts/gitaly-test-spawn b/scripts/gitaly-test-spawn index e7e25a217b2..eed79f75224 100755 --- a/scripts/gitaly-test-spawn +++ b/scripts/gitaly-test-spawn @@ -9,17 +9,11 @@ class GitalyTestSpawn include GitalySetup def run - set_bundler_config - install_gitaly_gems if ENV['CI'] - check_gitaly_config! + install_gitaly_gems - # # 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) + # Optionally specify the path to the gitaly config toml as first argument. + # Used by workhorse in test. + spawn_gitaly(ARGV[0]) end end |