Commit 938d8900 authored by Douwe Maan's avatar Douwe Maan

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
parents 369631c8 6f4c1fd5
...@@ -162,8 +162,9 @@ module TestEnv ...@@ -162,8 +162,9 @@ module TestEnv
version: Gitlab::GitalyClient.expected_server_version, version: Gitlab::GitalyClient.expected_server_version,
task: "gitlab:gitaly:install[#{gitaly_dir},#{repos_path}]") do task: "gitlab:gitaly:install[#{gitaly_dir},#{repos_path}]") do
start_gitaly(gitaly_dir) Gitlab::SetupHelper.create_gitaly_configuration(gitaly_dir, { 'default' => repos_path }, force: true)
end start_gitaly(gitaly_dir)
end
end end
def start_gitaly(gitaly_dir) def start_gitaly(gitaly_dir)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment