Commit b49dd2c5 authored by Ciro Santilli's avatar Ciro Santilli

Replace testme with gitlab-test.

parent fd338d67
...@@ -7,7 +7,7 @@ Sidekiq::Testing.inline! do ...@@ -7,7 +7,7 @@ Sidekiq::Testing.inline! do
'https://gitlab.com/gitlab-org/gitlab-ce.git', 'https://gitlab.com/gitlab-org/gitlab-ce.git',
'https://gitlab.com/gitlab-org/gitlab-ci.git', 'https://gitlab.com/gitlab-org/gitlab-ci.git',
'https://gitlab.com/gitlab-org/gitlab-shell.git', 'https://gitlab.com/gitlab-org/gitlab-shell.git',
'https://gitlab.com/gitlab-org/testme.git', 'https://gitlab.com/gitlab-org/gitlab-test.git',
'https://github.com/twitter/flight.git', 'https://github.com/twitter/flight.git',
'https://github.com/twitter/typeahead.js.git', 'https://github.com/twitter/typeahead.js.git',
'https://github.com/h5bp/html5-boilerplate.git', 'https://github.com/h5bp/html5-boilerplate.git',
......
...@@ -46,17 +46,16 @@ module TestEnv ...@@ -46,17 +46,16 @@ module TestEnv
end end
def setup_factory_repo def setup_factory_repo
repo_path = repos_path + "/root/testme.git" clone_url = "https://gitlab.com/gitlab-org/#{factory_repo_name}.git"
clone_url = 'https://gitlab.com/gitlab-org/gitlab-test.git'
unless File.directory?(repo_path) unless File.directory?(factory_repo_path)
git_cmd = %W(git clone --bare #{clone_url} #{repo_path}) git_cmd = %W(git clone --bare #{clone_url} #{factory_repo_path})
system(*git_cmd) system(*git_cmd)
end end
end end
def copy_repo(project) def copy_repo(project)
base_repo_path = File.expand_path(repos_path + "/root/testme.git") base_repo_path = File.expand_path(factory_repo_path)
target_repo_path = File.expand_path(repos_path + "/#{project.namespace.path}/#{project.path}.git") target_repo_path = File.expand_path(repos_path + "/#{project.namespace.path}/#{project.path}.git")
FileUtils.mkdir_p(target_repo_path) FileUtils.mkdir_p(target_repo_path)
FileUtils.cp_r("#{base_repo_path}/.", target_repo_path) FileUtils.cp_r("#{base_repo_path}/.", target_repo_path)
...@@ -66,4 +65,14 @@ module TestEnv ...@@ -66,4 +65,14 @@ module TestEnv
def repos_path def repos_path
Gitlab.config.gitlab_shell.repos_path Gitlab.config.gitlab_shell.repos_path
end end
private
def factory_repo_path
@factory_repo_path ||= repos_path + "/root/#{factory_repo_name}.git"
end
def factory_repo_name
'gitlab-test'
end
end end
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