Commit 0cc10d7b authored by Ash McKenzie's avatar Ash McKenzie

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
parents 1d8a4f12 beef83fc
...@@ -1664,4 +1664,4 @@ DEPENDENCIES ...@@ -1664,4 +1664,4 @@ DEPENDENCIES
yajl-ruby (~> 1.4.1) yajl-ruby (~> 1.4.1)
BUNDLED WITH BUNDLED WITH
2.1.4 2.3.6
...@@ -63,6 +63,7 @@ WORKDIR /home/gitlab/qa ...@@ -63,6 +63,7 @@ WORKDIR /home/gitlab/qa
# Install qa dependencies or fetch from cache if unchanged # Install qa dependencies or fetch from cache if unchanged
COPY ./qa/Gemfile* /home/gitlab/qa/ 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 RUN bundle install --jobs=$(nproc) --retry=3 --without=development --quiet
## ##
......
...@@ -355,4 +355,4 @@ DEPENDENCIES ...@@ -355,4 +355,4 @@ DEPENDENCIES
zeitwerk (~> 2.4) zeitwerk (~> 2.4)
BUNDLED WITH BUNDLED WITH
2.2.33 2.3.6
...@@ -36,6 +36,7 @@ function bundle_install_script() { ...@@ -36,6 +36,7 @@ function bundle_install_script() {
exit 1; exit 1;
fi; fi;
gem install bundler --no-document --conservative --version 2.3.6
bundle --version bundle --version
bundle config set path "$(pwd)/vendor" bundle config set path "$(pwd)/vendor"
bundle config set clean 'true' bundle config set clean 'true'
......
...@@ -47,7 +47,7 @@ RSpec.describe 'bin/metrics-server', :aggregate_failures do ...@@ -47,7 +47,7 @@ RSpec.describe 'bin/metrics-server', :aggregate_failures do
if @pid if @pid
pgrp = Process.getpgid(@pid) pgrp = Process.getpgid(@pid)
Timeout.timeout(5) do Timeout.timeout(10) do
Process.kill('TERM', -pgrp) Process.kill('TERM', -pgrp)
Process.waitpid(@pid) Process.waitpid(@pid)
end end
...@@ -63,7 +63,7 @@ RSpec.describe 'bin/metrics-server', :aggregate_failures do ...@@ -63,7 +63,7 @@ RSpec.describe 'bin/metrics-server', :aggregate_failures do
it 'serves /metrics endpoint' do it 'serves /metrics endpoint' do
expect do expect do
Timeout.timeout(5) do Timeout.timeout(10) do
http_ok = false http_ok = false
until http_ok until http_ok
sleep 1 sleep 1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment