[Title] Fixed a bug that remote job is not released from remote server queue

diff --git a/package/changelog b/package/changelog
index f8449a7f6ae876a1ecea90f1638024fcec4e5c3b..dfb0f1c995da0e6c7c31edc6afddf5323c2843c6 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 2.1.25
+- Fixed a bug that remote job is not released from remote server queue
+== donghee yang <donghee.yang@samsung.com> 2013-04-12
 * 2.1.24
 - Fixed a bug that job assignment to child server is wrong
 == donghee yang <donghee.yang@samsung.com> 2013-04-12

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index bc39ff5481e1e0c978e06534ad683a3c3157c5ab..f4eb581e6f1443ae3da84852d30a504a29386201 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Source : dibs
-Version :2.1.24
+Version :2.1.25
 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 b9c9dc9316758ab4fd32d177619eee4eaaed9845..144e0ae29e822ba030d91a3c78900ff642bb9c8e 100644 (file)
--- a/src/build_server/BuildJob.rb
+++ b/src/build_server/BuildJob.rb
@@ -742,6 +742,9 @@ class BuildJob < CommonJob
                        # build
                        if @is_remote_job then
                                result = builder.build_job(self, local_pkgs)
+                               # if remote build finishes, remove job from remote server
+                               get_remote_server().remove_working_job(self)
+                               get_remote_server().update_db()
                        else
                                result =  builder.build_job(self, use_clean, local_pkgs, false )
                        end

diff --git a/src/build_server/JobManager.rb b/src/build_server/JobManager.rb
index 8fe82bfbceaaabdf74a1df2b753becbc1ae68a85..7647fcbc013b04b8a0d6076d4e0c093413c2897f 100644 (file)
--- a/src/build_server/JobManager.rb
+++ b/src/build_server/JobManager.rb
@@ -335,12 +335,6 @@ class JobManager
 
 
        def dispose_job(job)
-               # if remote job, remove it from remote server's queue
-               if job.type == "BUILD" and job.is_remote_job then
-                       job.get_remote_server.remove_working_job(job)
-                       job.get_remote_server.update_db()
-               end
-
                # remove from queue
                @jobs.delete_if {|j| j.id == job.id}
                @internal_jobs.delete_if {|j| j.id == job.id}