Commit 726c7105 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '42290-pass-BUNDLE_PATH' into 'master'

Resolve "Make tests running bundle install for gitaly more flexible"

Closes #42290

See merge request gitlab-org/gitlab-ce!16654
parents 60963eac ac3d56e0
...@@ -21,7 +21,11 @@ namespace :gitlab do ...@@ -21,7 +21,11 @@ namespace :gitlab do
_, status = Gitlab::Popen.popen(%w[which gmake]) _, status = Gitlab::Popen.popen(%w[which gmake])
command << (status.zero? ? 'gmake' : 'make') command << (status.zero? ? 'gmake' : 'make')
command << 'BUNDLE_FLAGS=--no-deployment' if Rails.env.test? if Rails.env.test?
command.push(
'BUNDLE_FLAGS=--no-deployment',
"BUNDLE_PATH=#{Bundler.bundle_path}")
end
Gitlab::SetupHelper.create_gitaly_configuration(args.dir) Gitlab::SetupHelper.create_gitaly_configuration(args.dir)
Dir.chdir(args.dir) do Dir.chdir(args.dir) do
......
...@@ -76,7 +76,11 @@ describe 'gitlab:gitaly namespace rake task' do ...@@ -76,7 +76,11 @@ describe 'gitlab:gitaly namespace rake task' do
end end
context 'when Rails.env is test' do context 'when Rails.env is test' do
let(:command) { %w[make BUNDLE_FLAGS=--no-deployment] } let(:command) do
%W[make
BUNDLE_FLAGS=--no-deployment
BUNDLE_PATH=#{Bundler.bundle_path}]
end
before do before do
allow(Rails.env).to receive(:test?).and_return(true) allow(Rails.env).to receive(:test?).and_return(true)
......
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