ignore hashed repositories when doing rake gitlab:cleanup:dirs
This commit is contained in:
parent
b355ebc4c9
commit
17069a9547
2 changed files with 39 additions and 11 deletions
|
@ -6,6 +6,7 @@ namespace :gitlab do
|
|||
remove_flag = ENV['REMOVE']
|
||||
|
||||
namespaces = Namespace.pluck(:path)
|
||||
namespaces << '@hashed' # add so that it will be ignored
|
||||
Gitlab.config.repositories.storages.each do |name, repository_storage|
|
||||
git_base_path = repository_storage['path']
|
||||
all_dirs = Dir.glob(git_base_path + '/*')
|
||||
|
|
|
@ -5,7 +5,8 @@ describe 'gitlab:cleanup rake tasks' do
|
|||
Rake.application.rake_require 'tasks/gitlab/cleanup'
|
||||
end
|
||||
|
||||
context 'cleanup repositories' do
|
||||
describe 'cleanup' do
|
||||
|
||||
let(:gitaly_address) { Gitlab.config.repositories.storages.default.gitaly_address }
|
||||
let(:storages) do
|
||||
{
|
||||
|
@ -22,8 +23,13 @@ describe 'gitlab:cleanup rake tasks' do
|
|||
FileUtils.rm_rf(Settings.absolute('tmp/tests/default_storage'))
|
||||
end
|
||||
|
||||
it 'moves it to an orphaned path' do
|
||||
describe 'cleanup:repos' do
|
||||
before do
|
||||
FileUtils.mkdir_p(Settings.absolute('tmp/tests/default_storage/broken/project.git'))
|
||||
FileUtils.mkdir_p(Settings.absolute('tmp/tests/default_storage/@hashed/12/34/5678.git'))
|
||||
end
|
||||
|
||||
it 'moves it to an orphaned path' do
|
||||
run_rake_task('gitlab:cleanup:repos')
|
||||
repo_list = Dir['tmp/tests/default_storage/broken/*']
|
||||
|
||||
|
@ -31,11 +37,32 @@ describe 'gitlab:cleanup rake tasks' do
|
|||
end
|
||||
|
||||
it 'ignores @hashed repos' do
|
||||
FileUtils.mkdir_p(Settings.absolute('tmp/tests/default_storage/@hashed/12/34/5678.git'))
|
||||
|
||||
run_rake_task('gitlab:cleanup:repos')
|
||||
|
||||
expect(Dir.exist?(Settings.absolute('tmp/tests/default_storage/@hashed/12/34/5678.git'))).to be_truthy
|
||||
end
|
||||
end
|
||||
|
||||
describe 'cleanup:dirs' do
|
||||
it 'removes missing namespaces' do
|
||||
FileUtils.mkdir_p(Settings.absolute("tmp/tests/default_storage/namespace_1/project.git"))
|
||||
FileUtils.mkdir_p(Settings.absolute("tmp/tests/default_storage/namespace_2/project.git"))
|
||||
allow(Namespace).to receive(:pluck).and_return('namespace_1')
|
||||
|
||||
stub_env('REMOVE', 'true')
|
||||
run_rake_task('gitlab:cleanup:dirs')
|
||||
|
||||
expect(Dir.exist?(Settings.absolute('tmp/tests/default_storage/namespace_1'))).to be_truthy
|
||||
expect(Dir.exist?(Settings.absolute('tmp/tests/default_storage/namespace_2'))).to be_falsey
|
||||
end
|
||||
|
||||
it 'ignores @hashed directory' do
|
||||
FileUtils.mkdir_p(Settings.absolute('tmp/tests/default_storage/@hashed/12/34/5678.git'))
|
||||
|
||||
run_rake_task('gitlab:cleanup:dirs')
|
||||
|
||||
expect(Dir.exist?(Settings.absolute('tmp/tests/default_storage/@hashed/12/34/5678.git'))).to be_truthy
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue