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

Disable auto_create_container if enabled auto_publish

This commit is contained in:
Vokhmin Alexey V 2013-11-11 16:09:23 +04:00
parent 706df046a8
commit 524d967b74
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/build_list.rb
View File

@ -51,7 +51,8 @@ class BuildList < ActiveRecord::Base
before_validation :prepare_extra_repositories, :on => :create before_validation :prepare_extra_repositories, :on => :create
before_validation :prepare_extra_build_lists, :on => :create before_validation :prepare_extra_build_lists, :on => :create
before_validation :prepare_extra_params, :on => :create before_validation :prepare_extra_params, :on => :create
before_validation lambda { self.auto_publish = false if external_nodes.present?; true }, :on => :create before_validation lambda { self.auto_publish = false if external_nodes.present?; true }, :on => :create
before_validation lambda { self.auto_create_container = false if auto_publish?; true }, :on => :create
attr_accessible :include_repos, :auto_publish, :build_for_platform_id, :commit_hash, attr_accessible :include_repos, :auto_publish, :build_for_platform_id, :commit_hash,
:arch_id, :project_id, :save_to_repository_id, :update_type, :arch_id, :project_id, :save_to_repository_id, :update_type,

6
lib/abf_worker/build_lists_publish_task_manager.rb
View File

@ -91,10 +91,10 @@ module AbfWorker
'BUILD_FOR_PLATFORM' => build_list.build_for_platform.name 'BUILD_FOR_PLATFORM' => build_list.build_for_platform.name
}.map{ |k, v| "#{k}=#{v}" }.join(' ') }.map{ |k, v| "#{k}=#{v}" }.join(' ')
# Low priority
Resque.push( Resque.push(
'publish_worker_default', 'publish_worker',
'class' => 'AbfWorker::PublishWorkerDefault', 'class' => 'AbfWorker::PublishWorker',
'args' => [{ 'args' => [{
:id => build_list.id, :id => build_list.id,
:cmd_params => cmd_params, :cmd_params => cmd_params,