Merge branch 'gitaly-bundle-changes' into 'master'
Use `make install` for Gitaly setups in non-test environments See merge request gitlab-org/gitlab-ce!15295
This commit is contained in:
commit
6da130c295
|
@ -14,8 +14,10 @@ namespace :gitlab do
|
|||
|
||||
checkout_or_clone_version(version: version, repo: args.repo, target_dir: args.dir)
|
||||
|
||||
command = %w[/usr/bin/env -u RUBYOPT -u BUNDLE_GEMFILE]
|
||||
|
||||
_, 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?
|
||||
|
||||
|
@ -23,7 +25,7 @@ namespace :gitlab do
|
|||
create_gitaly_configuration
|
||||
# In CI we run scripts/gitaly-test-build instead of this command
|
||||
unless ENV['CI'].present?
|
||||
Bundler.with_original_env { run_command!(%w[/usr/bin/env -u RUBYOPT -u BUNDLE_GEMFILE] + command) }
|
||||
Bundler.with_original_env { run_command!(command) }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -80,9 +82,12 @@ namespace :gitlab do
|
|||
end
|
||||
|
||||
def create_gitaly_configuration
|
||||
File.open("config.toml", "w") do |f|
|
||||
File.open("config.toml", File::WRONLY | File::CREAT | File::EXCL) do |f|
|
||||
f.puts gitaly_configuration_toml
|
||||
end
|
||||
rescue Errno::EEXIST
|
||||
puts "Skipping config.toml generation:"
|
||||
puts "A configuration file already exists."
|
||||
rescue ArgumentError => e
|
||||
puts "Skipping config.toml generation:"
|
||||
puts e.message
|
||||
|
|
|
@ -47,7 +47,7 @@ describe 'gitlab:gitaly namespace rake task' do
|
|||
stub_env('CI', false)
|
||||
FileUtils.mkdir_p(clone_path)
|
||||
expect(Dir).to receive(:chdir).with(clone_path).and_call_original
|
||||
allow(Bundler).to receive(:bundle_path).and_return('/fake/bundle_path')
|
||||
allow(Rails.env).to receive(:test?).and_return(false)
|
||||
end
|
||||
|
||||
context 'gmake is available' do
|
||||
|
@ -57,7 +57,7 @@ describe 'gitlab:gitaly namespace rake task' do
|
|||
|
||||
it 'calls gmake in the gitaly directory' do
|
||||
expect(Gitlab::Popen).to receive(:popen).with(%w[which gmake]).and_return(['/usr/bin/gmake', 0])
|
||||
expect(main_object).to receive(:run_command!).with(command_preamble + %w[gmake BUNDLE_FLAGS=--no-deployment]).and_return(true)
|
||||
expect(main_object).to receive(:run_command!).with(command_preamble + %w[gmake]).and_return(true)
|
||||
|
||||
run_rake_task('gitlab:gitaly:install', clone_path)
|
||||
end
|
||||
|
@ -70,18 +70,20 @@ describe 'gitlab:gitaly namespace rake task' do
|
|||
end
|
||||
|
||||
it 'calls make in the gitaly directory' do
|
||||
expect(main_object).to receive(:run_command!).with(command_preamble + %w[make BUNDLE_FLAGS=--no-deployment]).and_return(true)
|
||||
expect(main_object).to receive(:run_command!).with(command_preamble + %w[make]).and_return(true)
|
||||
|
||||
run_rake_task('gitlab:gitaly:install', clone_path)
|
||||
end
|
||||
|
||||
context 'when Rails.env is not "test"' do
|
||||
context 'when Rails.env is test' do
|
||||
let(:command) { %w[make BUNDLE_FLAGS=--no-deployment] }
|
||||
|
||||
before do
|
||||
allow(Rails.env).to receive(:test?).and_return(false)
|
||||
allow(Rails.env).to receive(:test?).and_return(true)
|
||||
end
|
||||
|
||||
it 'calls make in the gitaly directory without BUNDLE_PATH' do
|
||||
expect(main_object).to receive(:run_command!).with(command_preamble + ['make']).and_return(true)
|
||||
it 'calls make in the gitaly directory with --no-deployment flag for bundle' do
|
||||
expect(main_object).to receive(:run_command!).with(command_preamble + command).and_return(true)
|
||||
|
||||
run_rake_task('gitlab:gitaly:install', clone_path)
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue