Commit 6f4c1fd5 authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg

Regenerate Gitaly's config.toml each rspec run

This behaviour I removed in 08cdf65b, but this reverts this specific
line. In case storages, or other options changes which are set by the
Rails environment, this will easier to migrate to.

Storage paths is kept in plural, to support multiple storage in later
release for just testing purposes. But its probable that multi Gitaly
scenarios need to be tested.
parent 2a8c3f6d
...@@ -158,8 +158,9 @@ module TestEnv ...@@ -158,8 +158,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