diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-25 15:11:20 +0300 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-25 15:11:22 +0300 |
commit | 6092f269cd62d5bd5fd515143bde8f353b64fc4f (patch) | |
tree | 4e5318a67c147182513914ea001c9c7c4b0670b9 /spec | |
parent | cdc01f897c45ad6b7638c1b37a9b5c5e583e27bd (diff) |
Merge branch 'security-2780-disable-git-v2-protocol-11-6' into 'security-11-6'
[11.6] Disable git v2 protocol temporarily
See merge request gitlab/gitlabhq!2860
(cherry picked from commit 5c80952f99aea931d53ac58b6068e1eabd8b6295)
d7d7bc0d Allow Gitaly to be built from a custom URL
c478d134 Disable git v2 protocol temporarily
Diffstat (limited to 'spec')
-rw-r--r-- | spec/support/helpers/test_env.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb index d52c40ff4f1..b4832716a8f 100644 --- a/spec/support/helpers/test_env.rb +++ b/spec/support/helpers/test_env.rb @@ -159,11 +159,12 @@ module TestEnv def setup_gitaly socket_path = Gitlab::GitalyClient.address('default').sub(/\Aunix:/, '') gitaly_dir = File.dirname(socket_path) + install_gitaly_args = [gitaly_dir, repos_path, gitaly_url].compact.join(',') component_timed_setup('Gitaly', install_dir: gitaly_dir, version: Gitlab::GitalyClient.expected_server_version, - task: "gitlab:gitaly:install[#{gitaly_dir},#{repos_path}]") do + task: "gitlab:gitaly:install[#{install_gitaly_args}]") do Gitlab::SetupHelper.create_gitaly_configuration(gitaly_dir, { 'default' => repos_path }, force: true) start_gitaly(gitaly_dir) @@ -214,6 +215,10 @@ module TestEnv # The process can already be gone if the test run was INTerrupted. end + def gitaly_url + ENV.fetch('GITALY_REPO_URL', nil) + end + def setup_factory_repo setup_repo(factory_repo_path, factory_repo_path_bare, factory_repo_name, BRANCH_SHA) |