diff options
author | Rémy Coutable <remy@rymai.me> | 2018-01-29 08:40:58 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-01-29 08:40:58 +0000 |
commit | 726c7105bfd095a6ad74a752df580bfb17b1f651 (patch) | |
tree | 35afb4d1957475106f7376a0966c1ef354baaf60 | |
parent | 60963eac0599fd8210c3a2e38fa887a75dfb8530 (diff) | |
parent | ac3d56e0ffde27cdcf6515a9af4930324ebdf151 (diff) | |
download | gitlab-ce-726c7105bfd095a6ad74a752df580bfb17b1f651.tar.gz |
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
-rw-r--r-- | lib/tasks/gitlab/gitaly.rake | 6 | ||||
-rw-r--r-- | spec/tasks/gitlab/gitaly_rake_spec.rb | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake index a2e68c0471b..aece8893974 100644 --- a/lib/tasks/gitlab/gitaly.rake +++ b/lib/tasks/gitlab/gitaly.rake @@ -21,7 +21,11 @@ namespace :gitlab do _, status = Gitlab::Popen.popen(%w[which gmake]) 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) Dir.chdir(args.dir) do diff --git a/spec/tasks/gitlab/gitaly_rake_spec.rb b/spec/tasks/gitlab/gitaly_rake_spec.rb index 6aba86fdc3c..b37d6ac831f 100644 --- a/spec/tasks/gitlab/gitaly_rake_spec.rb +++ b/spec/tasks/gitlab/gitaly_rake_spec.rb @@ -76,7 +76,11 @@ describe 'gitlab:gitaly namespace rake task' do end 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 allow(Rails.env).to receive(:test?).and_return(true) |