[Tiutle] Removed "fullbuild" command
authordonghee yang <donghee.yang@samsung.com>
Mon, 8 Apr 2013 07:13:56 +0000 (16:13 +0900)
committerdonghee yang <donghee.yang@samsung.com>
Mon, 8 Apr 2013 07:13:56 +0000 (16:13 +0900)
build-svr
src/build_server/BuildServerController.rb
src/build_server/BuildServerOptionParser.rb
src/build_server/ProjectManager.rb
src/build_server/SocketJobRequestListener.rb
test/build-server.basic2/build-svr-02.testcase

index 51953b1e7467ffb73c1ab2f8ae44f43d2784ba41..d892c672b4cec46c8fa63b77b915a11d199f2bfa 100755 (executable)
--- 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] )
 
index 42eb4a12186f09f7289c3a98b669d75156b454ef..c48881dcbbae68e6197ac5d633a8a4fe7a207432 100644 (file)
@@ -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)
index 0ab9726c4cb0d2918fb6357dfc16e80df863a9f9..1e228428c8a1dc171d0df69859c63795e633d201 100644 (file)
@@ -49,7 +49,6 @@ class BuildServerUsage
        REMOVE_SYNC="build-svr remove-sync -n <server name> -u <remote pkg server url> [--dist <distribution>]"
        ADD_PRJ="build-svr add-prj -n <server name> -N <project name> (-g <git repository> -b <git branch>|-P <package name>) [-w <password>] [-o <os list>] [--dist <distribution>]"
        REMOVE_PRJ="build-svr remove-prj -n <server name> -N <project name> [--dist <distribution>]"
-       FULLBUILD="build-svr fullbuild -n <server name> [--dist <distribution>]"
        REGISTER="build-svr register -n <server name> -P <package file> [--dist <distribution>]"
        QUERY="build-svr query -n <server name>"
        SET_ATTR="build-svr set-attr -n <server name> -A <attribute> -V <value>"
@@ -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
index c7172135e5508629d078d71f8904ca533ad4e29a..7052e7d7880751be2c524d7fe166a513e14ddd16 100644 (file)
@@ -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")
index f1fe5fec0940cd60223d3492a4fa36155abd44dc..0b342664b8a803c62ab7ac1f0cbb4d201c112ca2 100644 (file)
@@ -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}"
index 271b3c019a51b33bf7f4730cf30c34816882f27e..78e1e4e2f4a4c3306aeaca7f69730273187276e8 100644 (file)
@@ -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 <server name> -u <remote pkg server url> [--dist <distribu
 build-svr remove-sync -n <server name> -u <remote pkg server url> [--dist <distribution>]
 build-svr add-prj -n <server name> -N <project name> (-g <git repository> -b <git branch>|-P <package name>) [-w <password>] [-o <os list>] [--dist <distribution>]
 build-svr remove-prj -n <server name> -N <project name> [--dist <distribution>]
-build-svr fullbuild -n <server name> [--dist <distribution>]
 build-svr register -n <server name> -P <package file> [--dist <distribution>]
 build-svr query -n <server name>
 build-svr set-attr -n <server name> -A <attribute> -V <value>