diff options
| author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2018-10-23 19:58:28 -0300 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2018-10-23 19:58:28 -0300 |
| commit | f6ae451a938a9bf91e6a8c3318aa44beb1a8315a (patch) | |
| tree | 0b94d8595e54d663972a0841f71725c1e49814b0 /config/gitlab.yml.example | |
| parent | 6d8c0ed1bb09feac39fe86b5da3ac5eaede7a477 (diff) | |
| download | gitlab-ce-fix-gitaly-setup.tar.gz | |
Fix setup of repository storages for the test environmentfix-gitaly-setup
On the backup_rake_spec we require a second repository storage, which we
used to accomplish through a combination of rspec-mocks and special
configurations in the Gitaly installation. Since Gitaly now refuses to
start with invalid storages, we modified the setup code in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22530, but in
between tests the storage could be removed from the `tmp/` folder.
These changes simplify the approach by making the secondary storage a
_real_ storage and having `TestEnv` manage it the same way it does the
default storage.
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index a4db125f831..f67589f4361 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -772,6 +772,9 @@ test: default: path: tmp/tests/repositories/ gitaly_address: unix:tmp/tests/gitaly/gitaly.socket + secondary: + path: tmp/tests/repositories-secondary/ + gitaly_address: unix:tmp/tests/gitaly/gitaly.socket gitaly: client_path: tmp/tests/gitaly |