remove 'new_core' options for creating mass_builds

This commit is contained in:
Vokhmin Alexey V 2013-01-29 01:16:29 +04:00
parent 610e2dc1d0
commit 2af919014d
3 changed files with 4 additions and 7 deletions

View File

@ -12,8 +12,7 @@ class Platforms::MassBuildsController < Platforms::BaseController
def create
mass_build = @platform.mass_builds.new(:arches => params[:arches],
:auto_publish => params[:auto_publish] || false,
:projects_list => params[:projects_list],
:new_core => params[:new_core])
:projects_list => params[:projects_list])
mass_build.user = current_user
authorize! :create, mass_build

View File

@ -7,7 +7,7 @@ class MassBuild < ActiveRecord::Base
scope :outdated, where('created_at < ?', Time.now + 1.day - BuildList::MAX_LIVE_TIME)
attr_accessor :arches
attr_accessible :arches, :auto_publish, :projects_list, :new_core
attr_accessible :arches, :auto_publish, :projects_list
validates :platform_id, :arch_names, :name, :user_id, :projects_list, :presence => true
validates_inclusion_of :auto_publish, :in => [true, false]
@ -38,7 +38,7 @@ class MassBuild < ActiveRecord::Base
return if self.reload.stop_build
arches_list.each do |arch|
rep = (project.repositories & platform.repositories).first
project.build_for(platform, rep.id, user, arch, auto_publish, self.id, 0, new_core)
project.build_for(platform, rep.id, user, arch, auto_publish, self.id, 0)
end
rescue RuntimeError, Exception
end
@ -47,7 +47,6 @@ class MassBuild < ActiveRecord::Base
list = (missed_projects_list || '') << "#{name}\n"
update_column :missed_projects_list, list
end
sleep 1 unless new_core
end
end
later :build_all, :queue => :clone_build

View File

@ -130,7 +130,7 @@ class Project < ActiveRecord::Base
#path #share by NFS
end
def build_for(platform, repository_id, user, arch = Arch.find_by_name('i586'), auto_publish = false, mass_build_id = nil, priority = 0, new_core = false)
def build_for(platform, repository_id, user, arch = Arch.find_by_name('i586'), auto_publish = false, mass_build_id = nil, priority = 0)
# Select main and project platform repository(contrib, non-free and etc)
# If main does not exist, will connect only project platform repository
# If project platform repository is main, only main will be connect
@ -151,7 +151,6 @@ class Project < ActiveRecord::Base
bl.priority = priority
bl.mass_build_id = mass_build_id
bl.save_to_repository_id = repository_id
bl.new_core = new_core
end
build_list.save
end