Commit a37dd3e6 authored by Alessio Caiazza's avatar Alessio Caiazza

Merge branch 'sh-disable-praefect-postgresql-queue' into 'master'

Disable Praefect SQL queue in tests

Closes gitaly#2797

See merge request gitlab-org/gitlab!32742
parents 39293575 cd624465
...@@ -97,7 +97,7 @@ module Gitlab ...@@ -97,7 +97,7 @@ module Gitlab
def configuration_toml(gitaly_dir, storage_paths) def configuration_toml(gitaly_dir, storage_paths)
nodes = [{ storage: 'default', address: "unix:#{gitaly_dir}/gitaly.socket", primary: true, token: 'secret' }] nodes = [{ storage: 'default', address: "unix:#{gitaly_dir}/gitaly.socket", primary: true, token: 'secret' }]
storages = [{ name: 'default', node: nodes }] storages = [{ name: 'default', node: nodes }]
config = { socket_path: "#{gitaly_dir}/praefect.socket", virtual_storage: storages } config = { socket_path: "#{gitaly_dir}/praefect.socket", memory_queue_enabled: true, virtual_storage: storages }
config[:token] = 'secret' if Rails.env.test? config[:token] = 'secret' if Rails.env.test?
TomlRB.dump(config) TomlRB.dump(config)
......
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