Merge branch 'sh-update-bundler-2' into 'master'

Update bundler to v2.1.4 [RUN ALL RSPEC]

See merge request gitlab-org/gitlab!46615

.gitlab/ci/qa.gitlab-ci.yml

@@ -7,7 +7,6 @@
   before_script:
     - '[ "$FOSS_ONLY" = "1" ] && rm -rf ee/ qa/spec/ee/ qa/qa/specs/features/ee/ qa/qa/ee/ qa/qa/ee.rb'
     - cd qa/
-    - gem install bundler -v 1.17.3
     - bundle install --clean --jobs=$(nproc) --path=vendor --retry=3 --without=development --quiet
     - bundle check
 

.gitlab/ci/rails.gitlab-ci.yml

@@ -183,7 +183,6 @@ update-coverage-cache:
     - .shared:rules:update-cache
   stage: prepare
   script:
-    - run_timed_command "gem install bundler -v 1.17.3"
     - run_timed_command "bundle install --jobs=$(nproc) --path=vendor --retry=3 --quiet --without default development test production puma unicorn kerberos metrics omnibus ed25519"
   cache:
     policy: push  # We want to rebuild the cache from scratch to ensure stale dependencies are cleaned up.
@@ -289,6 +288,7 @@ db:migrate-from-v12.10.0:
     - git checkout -f FETCH_HEAD
     - sed -i -e "s/gem 'grpc', '~> 1.24.0'/gem 'grpc', '~> 1.30.2'/" Gemfile  # Update gRPC for Ruby 2.7
     - sed -i -e "s/gem 'google-protobuf', '~> 3.8.0'/gem 'google-protobuf', '~> 3.12.0'/" Gemfile
+    - gem install bundler:1.17.3
     - bundle update google-protobuf grpc bootsnap
     - bundle install $BUNDLE_INSTALL_FLAGS
     - date
@@ -363,7 +363,6 @@ rspec:coverage:
     - memory-static
     - memory-on-boot
   script:
-    - run_timed_command "gem install bundler -v 1.17.3"
     - run_timed_command "bundle install --jobs=$(nproc) --path=vendor --retry=3 --quiet --without default development test production puma unicorn kerberos metrics omnibus ed25519"
     - run_timed_command "bundle exec scripts/merge-simplecov"
     - run_timed_command "bundle exec scripts/gather-test-memory-data"
@@ -401,7 +400,6 @@ rspec:feature-flags:
     - memory-static
     - memory-on-boot
   script:
-    - run_timed_command "gem install bundler -v 1.17.3"
     - run_timed_command "bundle install --jobs=$(nproc) --path=vendor --retry=3 --quiet --without default development test production puma unicorn kerberos metrics omnibus ed25519"
     - run_timed_command "bundle exec scripts/used-feature-flags"
 # EE/FOSS: default refs (MRs, master, schedules) jobs #

.gitlab/ci/test-metadata.gitlab-ci.yml

@@ -39,7 +39,7 @@ update-tests-metadata:
     - rspec-ee integration pg11 geo
     - rspec-ee system pg11 geo
   script:
-    - run_timed_command "retry gem install bundler:1.17.3 fog-aws mime-types activesupport rspec_profiling postgres-copy --no-document"
+    - run_timed_command "retry gem install fog-aws mime-types activesupport rspec_profiling postgres-copy --no-document"
     - source ./scripts/rspec_helpers.sh
     - update_tests_metadata
     - update_tests_mapping

Gemfile.lock

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

qa/Dockerfile

@@ -65,7 +65,7 @@ COPY VERSION ./ee/app/models/license.r[b] /home/gitlab/ee/app/models/
 COPY ./lib/gitlab.rb /home/gitlab/lib/
 COPY ./lib/gitlab/utils.rb /home/gitlab/lib/gitlab/
 COPY ./INSTALLATION_TYPE ./VERSION /home/gitlab/
-RUN cd /home/gitlab/qa/ && gem install bundler:1.17.3 && bundle install --jobs=$(nproc) --retry=3 --without=development --quiet
+RUN cd /home/gitlab/qa/ && bundle install --jobs=$(nproc) --retry=3 --without=development --quiet
 COPY ./qa /home/gitlab/qa
 
 ENTRYPOINT ["bin/test"]

qa/Gemfile.lock

@@ -175,4 +175,4 @@ DEPENDENCIES
   timecop (~> 0.9.1)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

scripts/prepare_build.sh

@@ -5,8 +5,6 @@ export USE_BUNDLE_INSTALL=${USE_BUNDLE_INSTALL:-true}
 export BUNDLE_INSTALL_FLAGS=${BUNDLE_INSTALL_FLAGS:-"--without=production development --jobs=$(nproc) --path=vendor --retry=3 --quiet"}
 
 if [ "$USE_BUNDLE_INSTALL" != "false" ]; then
-  # This is for backwards compatibility for Gitaly
-  run_timed_command "gem install bundler:1.17.3"
   bundle --version
   run_timed_command "bundle install --clean ${BUNDLE_INSTALL_FLAGS}"
   run_timed_command "bundle check"

tooling/overcommit/Gemfile.lock

@@ -89,4 +89,4 @@ DEPENDENCIES
   scss_lint (~> 0.56.0)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4