From: donghee yang Date: Mon, 8 Apr 2013 07:13:56 +0000 (+0900) Subject: [Tiutle] Removed "fullbuild" command X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5ba7e4b89b6cd6e45ebf6a1f4a4effb8f5d626df;p=sdk%2Ftools%2Fsdk-build.git [Tiutle] Removed "fullbuild" command --- diff --git a/build-svr b/build-svr index 51953b1..d892c67 100755 --- a/build-svr +++ b/build-svr @@ -206,9 +206,6 @@ begin when "remove-prj" BuildServerController.remove_project( option[:name], option[:pid], option[:dist] ) - when "fullbuild" - BuildServerController.build_all_projects( option[:name], option[:dist] ) - when "register" BuildServerController.register_package( option[:name], option[:package], option[:dist] ) diff --git a/src/build_server/BuildServerController.rb b/src/build_server/BuildServerController.rb index 42eb4a1..c48881d 100644 --- a/src/build_server/BuildServerController.rb +++ b/src/build_server/BuildServerController.rb @@ -572,54 +572,6 @@ class BuildServerController end - # full build - def self.build_all_projects( id, dist_name ) - - # server - server = get_server(id) - migrate_db(server) - - # check distribution - dist_name = check_distribution_name(dist_name, server) - if dist_name.nil? then return false end - - client = BuildCommClient.create( "127.0.0.1", server.port ) - if client.nil? then - puts "Server is not running!" - return false - end - - # send request - fullbuild_ok = false - if client.send "FULLBUILD|#{server.password}|#{dist_name}" then - # recevie & print - mismatched = false - dist_not_found = false - result = client.read_lines do |l| - puts l - if l.include? "Password mismatched!" then - mismatched = true - end - if l.include? "Distribution not found!" then - dist_not_found = true - end - end - if result and not mismatched and not dist_not_found then - fullbuild_ok = true - end - end - - # terminate - client.terminate - - if not fullbuild_ok then - puts "Full build failed!" - end - - return true - end - - def self.register_package(id, file_path, dist_name) # server server = get_server(id) diff --git a/src/build_server/BuildServerOptionParser.rb b/src/build_server/BuildServerOptionParser.rb index 0ab9726..1e22842 100644 --- a/src/build_server/BuildServerOptionParser.rb +++ b/src/build_server/BuildServerOptionParser.rb @@ -49,7 +49,6 @@ class BuildServerUsage REMOVE_SYNC="build-svr remove-sync -n -u [--dist ]" ADD_PRJ="build-svr add-prj -n -N (-g -b |-P ) [-w ] [-o ] [--dist ]" REMOVE_PRJ="build-svr remove-prj -n -N [--dist ]" - FULLBUILD="build-svr fullbuild -n [--dist ]" REGISTER="build-svr register -n -P [--dist ]" QUERY="build-svr query -n " SET_ATTR="build-svr set-attr -n -A -V " @@ -164,11 +163,6 @@ def option_error_check( options ) raise ArgumentError, "Usage: " + BuildServerUsage::REMOVE_PRJ end - when "fullbuild" - if options[:name].nil? or options[:name].empty? then - raise ArgumentError, "Usage: " + BuildServerUsage::FULLBUILD - end - when "register" if options[:name].nil? or options[:name].empty? or options[:package].nil? or options[:package].empty? then @@ -222,7 +216,6 @@ def option_parse + "\t" + "add-prj Add project to build." + "\n" \ + "\t" + "remove-prj Remove project." + "\n" \ + "\t" + "register Register the package to the build-server." + "\n" \ - + "\t" + "fullbuild Build all your projects and upload them to package server." + "\n" \ + "\t" + "query Show build server configuration." + "\n" \ + "\t" + "set-attr Set build server atribute." + "\n" \ + "\t" + "get-attr Get build server atribute." + "\n" \ @@ -245,7 +238,6 @@ def option_parse + "\t" + BuildServerUsage::REMOVE_SYNC + "\n" \ + "\t" + BuildServerUsage::ADD_PRJ + "\n" \ + "\t" + BuildServerUsage::REMOVE_PRJ + "\n" \ - + "\t" + BuildServerUsage::FULLBUILD + "\n" \ + "\t" + BuildServerUsage::REGISTER + "\n" \ + "\t" + BuildServerUsage::QUERY + "\n" \ + "\t" + BuildServerUsage::SET_ATTR + "\n" \ @@ -367,7 +359,7 @@ def option_parse cmd.eql? "lock-dist" or cmd.eql? "unlock-dist" or cmd.eql? "add-sync" or cmd.eql? "remove-sync" or cmd.eql? "add-prj" or cmd.eql? "remove-prj" or - cmd.eql? "fullbuild" or cmd.eql? "register" or + cmd.eql? "register" or cmd.eql? "query" or cmd.eql? "set-attr" or cmd.eql? "get-attr" or cmd =~ /(-v)|(--version)/ or diff --git a/src/build_server/ProjectManager.rb b/src/build_server/ProjectManager.rb index c717213..7052e7d 100644 --- a/src/build_server/ProjectManager.rb +++ b/src/build_server/ProjectManager.rb @@ -223,35 +223,6 @@ class ProjectManager end - # create new full job - def create_new_full_build_job(dist_name="BASE") - # create multi job - result = MultiBuildJob.new( @server ) - - # create sub jobs - get_all_projects().each do |prj| - if prj.type != "GIT" then next end - if prj.dist_name != dist_name then next end - - prj.os_list.each do |os| - if not @server.supported_os_list.include? os then next end - - new_job = create_new_job( prj.name, os, dist_name ) - if new_job.nil? then next end - - # This make project to build - # even though there is a package of same version on pkg-server - new_job.set_force_rebuild(true) - - # add to multi job - result.add_sub_job( new_job ) - end - end - - return result - end - - # get project that includes specified pkg name and os # will return [project,os,ver] list def get_projects_from_pkgs(pkgs, dist_name="BASE") diff --git a/src/build_server/SocketJobRequestListener.rb b/src/build_server/SocketJobRequestListener.rb index f1fe5fe..0b34266 100644 --- a/src/build_server/SocketJobRequestListener.rb +++ b/src/build_server/SocketJobRequestListener.rb @@ -133,8 +133,6 @@ class SocketJobRequestListener handle_cmd_stop( req_line, req ) when "UPGRADE" handle_cmd_upgrade( req_line, req ) - when "FULLBUILD" - handle_cmd_fullbuild( req_line, req ) when "REGISTER" handle_cmd_register( req_line, req ) when "MONITOR" @@ -629,59 +627,6 @@ class SocketJobRequestListener end - # "FULLBUILD" - def handle_cmd_fullbuild( line, req ) - @log.info "Received REQ: #{line}" - - begin - handle_cmd_fullbuild_internal( line, req ) - rescue BuildServerException => e - @log.error(e.message) - BuildCommServer.send(req, e.err_message()) - BuildCommServer.send_end(req) - BuildCommServer.disconnect(req) - end - - @log.info "Handled REQ: #{line}" - end - - - def handle_cmd_fullbuild_internal( line, req ) - tok = line.split("|").map { |x| x.strip } - if tok.count < 2 then - raise BuildServerException.new("ERR001"), line - end - - server_passwd = tok[1] - dist_name = tok[2] - if (dist_name.nil? or dist_name.empty?) then - dist_name = @parent_server.distmgr.get_default_distribution_name() - end - - # check distribution - check_distribution(dist_name, req, true) - - # check server password - if server_passwd != @parent_server.password then - raise BuildServerException.new("ERR015"), "" - end - - # create full build job - new_job = @parent_server.prjmgr.create_new_full_build_job(dist_name) - - @parent_server.jobmgr.commit_job(new_job) - - # set logger - new_job.create_logger() - - BuildCommServer.send_end(req) - BuildCommServer.disconnect(req) - - # add to job - @parent_server.jobmgr.add_job( new_job ) - end - - # "REGISTER" def handle_cmd_register( line, req ) @log.info "Received REQ: #{line}" diff --git a/test/build-server.basic2/build-svr-02.testcase b/test/build-server.basic2/build-svr-02.testcase index 271b3c0..78e1e4e 100644 --- a/test/build-server.basic2/build-svr-02.testcase +++ b/test/build-server.basic2/build-svr-02.testcase @@ -27,7 +27,6 @@ remove-sync Remove package repository URL. add-prj Add project to build. remove-prj Remove project. register Register the package to the build-server. -fullbuild Build all your projects and upload them to package server. query Show build server configuration. set-attr Set build server atribute. get-attr Get build server atribute. @@ -51,7 +50,6 @@ build-svr add-sync -n -u [--dist -u [--dist ] build-svr add-prj -n -N (-g -b |-P ) [-w ] [-o ] [--dist ] build-svr remove-prj -n -N [--dist ] -build-svr fullbuild -n [--dist ] build-svr register -n -P [--dist ] build-svr query -n build-svr set-attr -n -A -V