Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/commands/metrics_server/metrics_server_spec.rb b/spec/commands/metrics_server/metrics_server_spec.rb
index b755801bb65..0178017ee37 100644
--- a/spec/commands/metrics_server/metrics_server_spec.rb
+++ b/spec/commands/metrics_server/metrics_server_spec.rb
@@ -47,7 +47,7 @@ RSpec.describe 'bin/metrics-server', :aggregate_failures do
       if @pid
         pgrp = Process.getpgid(@pid)
 
-        Timeout.timeout(5) do
+        Timeout.timeout(10) do
           Process.kill('TERM', -pgrp)
           Process.waitpid(@pid)
         end
@@ -63,7 +63,7 @@ RSpec.describe 'bin/metrics-server', :aggregate_failures do
 
     it 'serves /metrics endpoint' do
       expect do
-        Timeout.timeout(5) do
+        Timeout.timeout(10) do
           http_ok = false
           until http_ok
             sleep 1