[Title] Removed reverse build's inefficiency on remote build server

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 9ff6e77a6cc6b1a2db499f408a72282ab38badb2..dfe11b37094825d1a0f0fa3aa7803f209125b6aa 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Source : dibs
-Version :0.99.33
+Version :0.99.34
 Maintainer : taejun ha<taejun.ha@samsung.com>, jiil hyoun <jiil.hyoun@samsung.com>, donghyuk yang <donghyouk.yang@samsung.com>, donghee yang <donghee.yang@samsung.com>, sungmin kim <dev.sungmin.kim@samsung.com
 
 Package : dibs

diff --git a/src/build_server/BuildJob.rb b/src/build_server/BuildJob.rb
index 702014ea50df890ae1c708fa38e9963b97e430db..7f193009dc1ce4e204afc147c6e5a3b077ea3443 100644 (file)
--- a/src/build_server/BuildJob.rb
+++ b/src/build_server/BuildJob.rb
@@ -147,6 +147,11 @@ class BuildJob
        end
 
 
+       def is_rev_build_check_job()
+               return @is_rev_build_check_job
+       end
+
+
        def set_remote_job(server)
                @is_remote_job = true
                @remote_server=server
@@ -1092,8 +1097,13 @@ class BuildJob
                @log.info( "Copying log to #{outgoing_dir}", Log::LV_USER)
                file = "#{@source_path}/../log"
                FileUtils.copy_file(file, "#{outgoing_dir}/remote_log")
-
-               return copy_result_files( outgoing_dir )
+       
+               # copy result files, if not reverse build       
+               if not @is_rev_build_check_job then
+                       return copy_result_files( outgoing_dir )
+               else
+                       return true
+               end
        end
 
 

diff --git a/src/build_server/RemoteBuilder.rb b/src/build_server/RemoteBuilder.rb
index f42a318f87c35c79049675c40a25caaa33786391..76e31918d7d0883f772c659d6cf7ab693f1147fb 100644 (file)
--- a/src/build_server/RemoteBuilder.rb
+++ b/src/build_server/RemoteBuilder.rb
@@ -162,8 +162,8 @@ class RemoteBuilder
                                        break
                 end
 
-                               # gather result files
-                               if l =~ /Creating package file \.\.\. (.*)/ then
+                               # gather result files if not reverse build
+                               if not is_rev_build and l =~ /Creating package file \.\.\. (.*)/ then
                                        file_name = $1
                                        result_files.push file_name
                                end

diff --git a/src/build_server/SocketJobRequestListener.rb b/src/build_server/SocketJobRequestListener.rb
index aaf4ca3339d0799e95f7f3c57bb6e76cb79e0cf9..32022b047204d791fe4a72199dd68c96263cb852 100644 (file)
--- a/src/build_server/SocketJobRequestListener.rb
+++ b/src/build_server/SocketJobRequestListener.rb
@@ -268,7 +268,11 @@ class SocketJobRequestListener
                end     
 
                # add to job queue
-               @parent_server.jobmgr.add_job( new_job )
+               if new_job.is_rev_build_check_job() then
+                       @parent_server.jobmgr.add_reverse_build_job( new_job )
+               else
+                       @parent_server.jobmgr.add_job( new_job )
+               end
        end