Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

2 files changed, 11 insertions, 4 deletions

diff --git a/spec/commands/metrics_server/metrics_server_spec.rb b/spec/commands/metrics_server/metrics_server_spec.rb
index f93be1d9f88..310e31da045 100644
--- a/spec/commands/metrics_server/metrics_server_spec.rb
+++ b/spec/commands/metrics_server/metrics_server_spec.rb
@@ -70,7 +70,8 @@ RSpec.describe 'GitLab metrics server', :aggregate_failures do
       before do
         if use_golang_server
           stub_env('GITLAB_GOLANG_METRICS_SERVER', '1')
-          allow(Settings).to receive(:monitoring).and_return(config.dig('test', 'monitoring'))
+          allow(Settings).to receive(:monitoring).and_return(
+            Settingslogic.new(config.dig('test', 'monitoring')))
         else
           config_file.write(YAML.dump(config))
           config_file.close
diff --git a/spec/commands/sidekiq_cluster/cli_spec.rb b/spec/commands/sidekiq_cluster/cli_spec.rb
index c2ea9455de6..0c32fa2571a 100644
--- a/spec/commands/sidekiq_cluster/cli_spec.rb
+++ b/spec/commands/sidekiq_cluster/cli_spec.rb
@@ -245,9 +245,15 @@ RSpec.describe Gitlab::SidekiqCluster::CLI, stub_settings_source: true do # rubo
         it 'expands multiple queue groups correctly' do
           expected_workers =
             if Gitlab.ee?
-              [%w[chat_notification], %w[project_export projects_import_export_parallel_project_export projects_import_export_relation_export project_template_export]]
+              [
+                %w[cronjob:clusters_integrations_check_prometheus_health incident_management_close_incident status_page_publish],
+                %w[project_export projects_import_export_parallel_project_export projects_import_export_relation_export project_template_export]
+              ]
             else
-              [%w[chat_notification], %w[project_export projects_import_export_parallel_project_export projects_import_export_relation_export]]
+              [
+                %w[cronjob:clusters_integrations_check_prometheus_health incident_management_close_incident],
+                %w[project_export projects_import_export_parallel_project_export projects_import_export_relation_export]
+              ]
             end
 
           expect(Gitlab::SidekiqCluster)
@@ -255,7 +261,7 @@ RSpec.describe Gitlab::SidekiqCluster::CLI, stub_settings_source: true do # rubo
             .with(expected_workers, default_options)
             .and_return([])
 
-          cli.run(%w(--queue-selector feature_category=chatops&has_external_dependencies=true resource_boundary=memory&feature_category=importers))
+          cli.run(%w(--queue-selector feature_category=incident_management&has_external_dependencies=true resource_boundary=memory&feature_category=importers))
         end
 
         it 'allows the special * selector' do