diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 21:08:10 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 21:08:10 +0300 |
| commit | 5d75b2b9a9d11c20667895e6aa68ea4e76658c5d (patch) | |
| tree | 2aa529b0a153c805f5f4ecb357321a4e4f4c59cb /scripts/gitaly-test-build | |
| parent | 6f2065c468b05658125b746169c56764a8ccddb1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/gitaly-test-build')
| -rwxr-xr-x | scripts/gitaly-test-build | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/gitaly-test-build b/scripts/gitaly-test-build index 374401caf89..fcf0049162b 100755 --- a/scripts/gitaly-test-build +++ b/scripts/gitaly-test-build @@ -17,13 +17,16 @@ class GitalyTestBuild check_gitaly_config! # Starting gitaly further validates its configuration - pid = start_gitaly - Process.kill('TERM', pid) + gitaly_pid = start_gitaly + praefect_pid = start_praefect + Process.kill('TERM', gitaly_pid) + Process.kill('TERM', praefect_pid) # Make the 'gitaly' executable look newer than 'GITALY_SERVER_VERSION'. # Without this a gitaly executable created in the setup-test-env job # will look stale compared to GITALY_SERVER_VERSION. FileUtils.touch(File.join(tmp_tests_gitaly_dir, 'gitaly'), mtime: Time.now + (1 << 24)) + FileUtils.touch(File.join(tmp_tests_gitaly_dir, 'praefect'), mtime: Time.now + (1 << 24)) end end |