diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-11-08 11:41:55 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-11-08 11:41:55 +0000 |
| commit | 938d8900ad64edc7ad0fda7f6ed98f454c4528d1 (patch) | |
| tree | 42a015bcc469942cbacef020513e614f8964eb38 /spec | |
| parent | 369631c84195f6b8b26624d5647ae994e64b77e8 (diff) | |
| parent | 6f4c1fd5a5310e49b4471800a09eb150eacba60a (diff) | |
| download | gitlab-ce-938d8900ad64edc7ad0fda7f6ed98f454c4528d1.tar.gz | |
Merge branch 'zj-regenerate-gitaly-config-rspec' into 'master'
Regenerate Gitaly's config.toml each rspec run
See merge request gitlab-org/gitlab-ce!22562
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/support/helpers/test_env.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb index 9e87b877b93..1f00cdf7e92 100644 --- a/spec/support/helpers/test_env.rb +++ b/spec/support/helpers/test_env.rb @@ -162,8 +162,9 @@ module TestEnv version: Gitlab::GitalyClient.expected_server_version, task: "gitlab:gitaly:install[#{gitaly_dir},#{repos_path}]") do - start_gitaly(gitaly_dir) - end + Gitlab::SetupHelper.create_gitaly_configuration(gitaly_dir, { 'default' => repos_path }, force: true) + start_gitaly(gitaly_dir) + end end def start_gitaly(gitaly_dir) |