diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-19 14:01:45 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-19 14:01:45 +0300 |
| commit | 9297025d0b7ddf095eb618dfaaab2ff8f2018d8b (patch) | |
| tree | 865198c01d1824a9b098127baa3ab980c9cd2c06 /spec/support/helpers/stub_configuration.rb | |
| parent | 6372471f43ee03c05a7c1f8b0c6ac6b8a7431dbe (diff) | |
Add latest changes from gitlab-org/gitlab@16-7-stable-eev16.7.0-rc42
Diffstat (limited to 'spec/support/helpers/stub_configuration.rb')
| -rw-r--r-- | spec/support/helpers/stub_configuration.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/spec/support/helpers/stub_configuration.rb b/spec/support/helpers/stub_configuration.rb index 562805cec3d..e043d1249b9 100644 --- a/spec/support/helpers/stub_configuration.rb +++ b/spec/support/helpers/stub_configuration.rb @@ -93,10 +93,11 @@ module StubConfiguration messages.deep_stringify_keys! # Default storage is always required - messages['default'] ||= Gitlab.config.repositories.storages.default + messages['default'] ||= Gitlab.config.repositories.storages[GitalySetup::REPOS_STORAGE] messages.each do |storage_name, storage_hash| - if !storage_hash.key?('path') || storage_hash['path'] == Gitlab::GitalyClient::StorageSettings::Deprecated - storage_hash['path'] = Gitlab::GitalyClient::StorageSettings.allow_disk_access { TestEnv.repos_path } + # Default additional storages to connect to the default storage + unless storage_hash.key?('gitaly_address') + storage_hash['gitaly_address'] = Gitlab.config.repositories.storages[GitalySetup::REPOS_STORAGE].gitaly_address end messages[storage_name] = Gitlab::GitalyClient::StorageSettings.new(storage_hash.to_h) |