diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-07 21:16:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-07 21:16:06 +0300 |
commit | 8bac8f55ba93bb03f7391b939dc6644e67fe5216 (patch) | |
tree | 12cd1f579cb725050452fe4acf2d541253ad413f /scripts | |
parent | c68ee79c332a9a08abaed7eb48fbc563a584d31d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/gitaly-test-build | 2 | ||||
-rwxr-xr-x | scripts/gitaly-test-spawn | 13 |
2 files changed, 2 insertions, 13 deletions
diff --git a/scripts/gitaly-test-build b/scripts/gitaly-test-build index e6afadccc7e..adc9b56ca4f 100755 --- a/scripts/gitaly-test-build +++ b/scripts/gitaly-test-build @@ -13,8 +13,6 @@ class GitalyTestBuild include GitalySetup def run - set_bundler_config - # If we have the binaries from the cache, we can skip building them again if File.exist?(tmp_tests_gitaly_bin_dir) GitalySetup::LOGGER.debug "Gitaly binary already built. Skip building...\n" diff --git a/scripts/gitaly-test-spawn b/scripts/gitaly-test-spawn index e7e25a217b2..3bf2de76760 100755 --- a/scripts/gitaly-test-spawn +++ b/scripts/gitaly-test-spawn @@ -9,17 +9,8 @@ class GitalyTestSpawn include GitalySetup def run - 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) + install_gitaly_gems + spawn_gitaly end end |