Add latest changes from gitlab-org/gitlab@16-6-stable-eev16.6.0-rc42

1 files changed, 8 insertions, 11 deletions

diff --git a/spec/workers/every_sidekiq_worker_spec.rb b/spec/workers/every_sidekiq_worker_spec.rb
index 4855967d462..4c2cff434a7 100644
--- a/spec/workers/every_sidekiq_worker_spec.rb
+++ b/spec/workers/every_sidekiq_worker_spec.rb
@@ -137,11 +137,11 @@ RSpec.describe 'Every Sidekiq worker', feature_category: :shared do
         'BuildHooksWorker' => 3,
         'BuildQueueWorker' => 3,
         'BuildSuccessWorker' => 3,
-        'BulkImportWorker' => false,
+        'BulkImportWorker' => 3,
         'BulkImports::ExportRequestWorker' => 5,
-        'BulkImports::EntityWorker' => false,
-        'BulkImports::PipelineWorker' => false,
-        'BulkImports::PipelineBatchWorker' => false,
+        'BulkImports::EntityWorker' => 3,
+        'BulkImports::PipelineWorker' => 3,
+        'BulkImports::PipelineBatchWorker' => 3,
         'BulkImports::FinishProjectImportWorker' => 5,
         'Chaos::CpuSpinWorker' => 3,
         'Chaos::DbSpinWorker' => 3,
@@ -325,10 +325,6 @@ RSpec.describe 'Every Sidekiq worker', feature_category: :shared do
         'Groups::ScheduleBulkRepositoryShardMovesWorker' => 3,
         'Groups::UpdateRepositoryStorageWorker' => 3,
         'Groups::UpdateStatisticsWorker' => 3,
-        'HashedStorage::MigratorWorker' => 3,
-        'HashedStorage::ProjectMigrateWorker' => 3,
-        'HashedStorage::ProjectRollbackWorker' => 3,
-        'HashedStorage::RollbackerWorker' => 3,
         'ImportIssuesCsvWorker' => 3,
         'ImportSoftwareLicensesWorker' => 3,
         'IncidentManagement::AddSeveritySystemNoteWorker' => 3,
@@ -355,8 +351,6 @@ RSpec.describe 'Every Sidekiq worker', feature_category: :shared do
         'Llm::Embedding::GitlabDocumentation::SetEmbeddingsOnTheRecordWorker' => 5,
         'Llm::Embedding::GitlabDocumentation::CreateEmptyEmbeddingsRecordsWorker' => 3,
         'Llm::Embedding::GitlabDocumentation::CreateDbEmbeddingsPerDocFileWorker' => 5,
-        'Llm::TanukiBot::UpdateWorker' => 1,
-        'Llm::TanukiBot::RecreateRecordsWorker' => 3,
         'MailScheduler::IssueDueWorker' => 3,
         'MailScheduler::NotificationServiceWorker' => 3,
         'MembersDestroyer::UnassignIssuablesWorker' => 3,
@@ -396,6 +390,7 @@ RSpec.describe 'Every Sidekiq worker', feature_category: :shared do
         'Packages::Go::SyncPackagesWorker' => 3,
         'Packages::MarkPackageFilesForDestructionWorker' => 3,
         'Packages::Maven::Metadata::SyncWorker' => 3,
+        'Packages::Npm::CleanupStaleMetadataCacheWorker' => 0,
         'Packages::Nuget::ExtractionWorker' => 3,
         'Packages::Rubygems::ExtractionWorker' => 3,
         'PagesDomainSslRenewalWorker' => 3,
@@ -486,7 +481,9 @@ RSpec.describe 'Every Sidekiq worker', feature_category: :shared do
         'X509CertificateRevokeWorker' => 3,
         'ComplianceManagement::MergeRequests::ComplianceViolationsWorker' => 3,
         'Zoekt::IndexerWorker' => 2,
-        'Issuable::RelatedLinksCreateWorker' => 3
+        'Issuable::RelatedLinksCreateWorker' => 3,
+        'BulkImports::RelationBatchExportWorker' => 3,
+        'BulkImports::RelationExportWorker' => 3
       }.merge(extra_retry_exceptions)
     end