Delete container repository tags outside of transaction

When there are many tags in a container repository, deleting them
can exceed the default 60 second idle-in-transaction timeout in
Sidekiq. We now explicitly delete them in the DestroyService
before destroying the model.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51380

2 files changed, 2 insertions, 1 deletions

diff --git a/spec/features/container_registry_spec.rb b/spec/features/container_registry_spec.rb
index 9986206f619..0dddf6d3ec5 100644
--- a/spec/features/container_registry_spec.rb
+++ b/spec/features/container_registry_spec.rb
@@ -39,7 +39,7 @@ describe "Container Registry", :js do
       visit_container_registry
 
       expect_any_instance_of(ContainerRepository)
-        .to receive(:delete_tags!).and_return(true)
+        .to receive(:delete_tags!).twice.and_return(true)
 
       click_on(class: 'js-remove-repo')
     end
diff --git a/spec/services/projects/container_repository/destroy_service_spec.rb b/spec/services/projects/container_repository/destroy_service_spec.rb
index 307ccc88865..af54e1b15e3 100644
--- a/spec/services/projects/container_repository/destroy_service_spec.rb
+++ b/spec/services/projects/container_repository/destroy_service_spec.rb
@@ -33,6 +33,7 @@ describe Projects::ContainerRepository::DestroyService do
       end
 
       it 'deletes the repository' do
+        expect(repository).to receive(:delete_tags!).twice.and_call_original
         expect { described_class.new(project, user).execute(repository) }.to change { ContainerRepository.all.count }.by(-1)
       end
     end