Added mock build. Part 4
This commit is contained in:
@@ -244,6 +244,7 @@ class ProjectsActions
|
||||
end
|
||||
|
||||
def build_projects_git(prj_id, git_id, counter_file)
|
||||
bld_id = 0
|
||||
build_ok = true
|
||||
proj_path = get_project_path(prj_id)
|
||||
git_name = @db.get_repo_info_by_id(git_id)
|
||||
@@ -256,6 +257,13 @@ class ProjectsActions
|
||||
unless result
|
||||
#Файл заблокирован считать id и вывести сведения о сборке
|
||||
build_ok = false
|
||||
build_id = f.gets.strip.to_i
|
||||
if build_id > 0
|
||||
build_info = @db.get_build_task_process_log(build_id)
|
||||
unless build_info.nil?
|
||||
bld_id = build_info[:id]
|
||||
end
|
||||
end
|
||||
else
|
||||
#Сборка завершилась, но каталог не подчистился
|
||||
FileUtils.rm_rf(prepare_path)
|
||||
@@ -272,9 +280,16 @@ class ProjectsActions
|
||||
File.open(lockf_path, File::RDWR | File::CREAT) do |f|
|
||||
f.flock(File::LOCK_EX)
|
||||
#Начинаем сборку
|
||||
mock = MockManager.new(prepare_path, get_project_config(prj_id), counter_file, @db)
|
||||
FileUtils.rm_rf(prepare_path)
|
||||
build_path = File.join(proj_path, PROJECTS_STRUCTURE[:LOGS], git_name[:reponame])
|
||||
repo_path = File.join(proj_path, PROJECTS_STRUCTURE[:REPO])
|
||||
@db.create_build_task(prj_id, git_id, build_path)
|
||||
build_id = @db.last_id
|
||||
mock = MockManager.new(prepare_path, get_project_config(prj_id), counter_file, @db, build_path, repo_path)
|
||||
bld_id = build_id
|
||||
@db.update_build_task_error_log(build_id, mock.get_build_process_log)
|
||||
mock.build_task
|
||||
end
|
||||
end
|
||||
bld_id
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user