Add latest changes from gitlab-org/gitlab@16-2-stable-eev16.2.0-rc42

2 files changed, 10 insertions, 30 deletions

diff --git a/spec/commands/metrics_server/metrics_server_spec.rb b/spec/commands/metrics_server/metrics_server_spec.rb
index 88a28b02903..ee07602016f 100644
--- a/spec/commands/metrics_server/metrics_server_spec.rb
+++ b/spec/commands/metrics_server/metrics_server_spec.rb
@@ -30,18 +30,6 @@ RSpec.describe 'GitLab metrics server', :aggregate_failures do
     }
   end
 
-  before(:all) do
-    Rake.application.rake_require 'tasks/gitlab/metrics_exporter'
-
-    @exporter_path = Rails.root.join('tmp', 'test', 'gme')
-
-    run_rake_task('gitlab:metrics_exporter:install', @exporter_path)
-  end
-
-  after(:all) do
-    FileUtils.rm_rf(@exporter_path)
-  end
-
   shared_examples 'serves metrics endpoint' do
     it 'serves /metrics endpoint' do
       start_server!
@@ -59,24 +47,18 @@ RSpec.describe 'GitLab metrics server', :aggregate_failures do
     end
   end
 
-  shared_examples 'spawns a server' do |target, use_golang_server|
-    context "targeting #{target} when using Golang server is #{use_golang_server}" do
+  shared_examples 'spawns a server' do |target|
+    context "targeting #{target}" do
       let(:metrics_dir) { Dir.mktmpdir }
 
       subject(:start_server!) do
-        @pid = MetricsServer.spawn(target, metrics_dir: metrics_dir, path: @exporter_path.join('bin'))
+        @pid = MetricsServer.spawn(target, metrics_dir: metrics_dir)
       end
 
       before do
-        if use_golang_server
-          stub_env('GITLAB_GOLANG_METRICS_SERVER', '1')
-          allow(Settings).to receive(:monitoring).and_return(
-            GitlabSettings::Options.build(config.dig('test', 'monitoring')))
-        else
-          config_file.write(YAML.dump(config))
-          config_file.close
-          stub_env('GITLAB_CONFIG', config_file.path)
-        end
+        config_file.write(YAML.dump(config))
+        config_file.close
+        stub_env('GITLAB_CONFIG', config_file.path)
         # We need to send a request to localhost
         WebMock.allow_net_connect!
       end
@@ -111,8 +93,6 @@ RSpec.describe 'GitLab metrics server', :aggregate_failures do
     end
   end
 
-  it_behaves_like 'spawns a server', 'puma', true
-  it_behaves_like 'spawns a server', 'puma', false
-  it_behaves_like 'spawns a server', 'sidekiq', true
-  it_behaves_like 'spawns a server', 'sidekiq', false
+  it_behaves_like 'spawns a server', 'puma'
+  it_behaves_like 'spawns a server', 'sidekiq'
 end
diff --git a/spec/commands/sidekiq_cluster/cli_spec.rb b/spec/commands/sidekiq_cluster/cli_spec.rb
index 085be1ceac2..a63e7158c2a 100644
--- a/spec/commands/sidekiq_cluster/cli_spec.rb
+++ b/spec/commands/sidekiq_cluster/cli_spec.rb
@@ -247,13 +247,13 @@ RSpec.describe Gitlab::SidekiqCluster::CLI, feature_category: :gitlab_cli, stub_
           expected_workers =
             if Gitlab.ee?
               [
-                %w[cronjob:clusters_integrations_check_prometheus_health incident_management_close_incident status_page_publish] + described_class::DEFAULT_QUEUES,
+                %w[incident_management_close_incident status_page_publish] + described_class::DEFAULT_QUEUES,
                 %w[bulk_imports_pipeline bulk_imports_relation_export project_export projects_import_export_parallel_project_export projects_import_export_relation_export repository_import project_template_export] +
                   described_class::DEFAULT_QUEUES
               ]
             else
               [
-                %w[cronjob:clusters_integrations_check_prometheus_health incident_management_close_incident] + described_class::DEFAULT_QUEUES,
+                %w[incident_management_close_incident] + described_class::DEFAULT_QUEUES,
                 %w[bulk_imports_pipeline bulk_imports_relation_export project_export projects_import_export_parallel_project_export projects_import_export_relation_export repository_import] +
                   described_class::DEFAULT_QUEUES
               ]