Merge branch 'update-bundler' into 'master'

Update bundler to 2.3.6 because 2.1.4 is too old

See merge request gitlab-org/gitlab!79251

Gemfile.lock

@@ -1664,4 +1664,4 @@ DEPENDENCIES
   yajl-ruby (~> 1.4.1)
 
 BUNDLED WITH
-   2.1.4
+   2.3.6

qa/Dockerfile

@@ -63,6 +63,7 @@ WORKDIR /home/gitlab/qa
 
 # Install qa dependencies or fetch from cache if unchanged
 COPY ./qa/Gemfile* /home/gitlab/qa/
+RUN gem install bundler --no-document --conservative --version 2.3.6
 RUN bundle install --jobs=$(nproc) --retry=3 --without=development --quiet
 
 ##

qa/Gemfile.lock

@@ -355,4 +355,4 @@ DEPENDENCIES
   zeitwerk (~> 2.4)
 
 BUNDLED WITH
-   2.2.33
+   2.3.6

scripts/utils.sh

@@ -36,6 +36,7 @@ function bundle_install_script() {
     exit 1;
   fi;
 
+  gem install bundler --no-document --conservative --version 2.3.6
   bundle --version
   bundle config set path "$(pwd)/vendor"
   bundle config set clean 'true'

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