Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#309: pass extra_params into workers

This commit is contained in:
Vokhmin Alexey V 2013-09-20 22:43:03 +04:00
parent 3b3ca4f7ea
commit 61824abf10
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/models/build_list.rb
View File

@ -449,12 +449,20 @@ class BuildList < ActiveRecord::Base
git_project_address = project.git_project_address user git_project_address = project.git_project_address user
# git_project_address.gsub!(/^http:\/\/(0\.0\.0\.0|localhost)\:[\d]+/, 'https://abf.rosalinux.ru') unless Rails.env.production? # git_project_address.gsub!(/^http:\/\/(0\.0\.0\.0|localhost)\:[\d]+/, 'https://abf.rosalinux.ru') unless Rails.env.production?
cmd_params = {
'GIT_PROJECT_ADDRESS' => git_project_address,
'COMMIT_HASH' => commit_hash,
'EXTRA_CFG_OPTIONS' => extra_params['cfg_options'],
'EXTRA_BUILD_SRC_RPM_OPTIONS' => extra_params['build_src_rpm'],
'EXTRA_BUILD_RPM_OPTIONS' => extra_params['build_rpm']
}.map{ |k, v| "#{k}=#{v}" }.join(' ')
{ {
:id => id, :id => id,
:time_living => (build_for_platform.platform_arch_settings.by_arch(arch).first.try(:time_living) || PlatformArchSetting::DEFAULT_TIME_LIVING), :time_living => (build_for_platform.platform_arch_settings.by_arch(arch).first.try(:time_living) || PlatformArchSetting::DEFAULT_TIME_LIVING),
:distrib_type => build_for_platform.distrib_type, :distrib_type => build_for_platform.distrib_type,
:git_project_address => git_project_address, :cmd_params => cmd_params,
:commit_hash => commit_hash,
:include_repos => include_repos_hash, :include_repos => include_repos_hash,
:platform => { :platform => {
:type => build_for_platform.distrib_type, :type => build_for_platform.distrib_type,