diff --git a/app/models/build_list.rb b/app/models/build_list.rb index 245f2603c..f4a3260a4 100644 --- a/app/models/build_list.rb +++ b/app/models/build_list.rb @@ -51,7 +51,8 @@ class BuildList < ActiveRecord::Base before_validation :prepare_extra_repositories, :on => :create before_validation :prepare_extra_build_lists, :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, :arch_id, :project_id, :save_to_repository_id, :update_type, diff --git a/lib/abf_worker/build_lists_publish_task_manager.rb b/lib/abf_worker/build_lists_publish_task_manager.rb index 5a9f7bc7e..c98d6fcc5 100644 --- a/lib/abf_worker/build_lists_publish_task_manager.rb +++ b/lib/abf_worker/build_lists_publish_task_manager.rb @@ -91,10 +91,10 @@ module AbfWorker 'BUILD_FOR_PLATFORM' => build_list.build_for_platform.name }.map{ |k, v| "#{k}=#{v}" }.join(' ') - + # Low priority Resque.push( - 'publish_worker_default', - 'class' => 'AbfWorker::PublishWorkerDefault', + 'publish_worker', + 'class' => 'AbfWorker::PublishWorker', 'args' => [{ :id => build_list.id, :cmd_params => cmd_params,