From 868f445398b53b84d4dd39373b6bb8a14c561712 Mon Sep 17 00:00:00 2001
From: donghee yang <donghee.yang@samsung.com>
Date: Tue, 19 Nov 2013 17:47:15 +0900
Subject: [PATCH] build server: fixed a bug about transferred job [Description]
  transferred job failed when no "master"

Change-Id: Ice9b6d1e4a94fe11555471cdf5d29a002ebae746
Signed-off-by: donghee yang <donghee.yang@samsung.com>
---
 package/changelog                            |  3 +++
 package/pkginfo.manifest                     |  2 +-
 src/build_server/CommonProject.rb            |  9 ++++++++-
 src/build_server/ProjectManager.rb           |  7 +++++--
 src/build_server/RemoteBuilder.rb            |  7 ++++++-
 src/build_server/SocketJobRequestListener.rb | 10 ++++++----
 test/build-server.multi-svr1/01.testcase     |  2 +-
 test/build-server.multi-svr1/02.testcase     |  2 +-
 8 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/package/changelog b/package/changelog
index 2ce84e4..ea275d5 100644
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 2.1.53
+- Fixed bug that transferred job failed when it has no "master" branch
+== donghee yang <donghee.yang@samsung.com> 2013-11-19
 * 2.1.52
 - support ftp as a package server
 == hyoun jiil <jiil.hyoun@samsung.com> 2013-11-18
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 7a16447..2a86694 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Source : dibs
-Version :2.1.52
+Version :2.1.53
 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 : tizen-dibs-test
diff --git a/src/build_server/CommonProject.rb b/src/build_server/CommonProject.rb
index f8928df..390f6b8 100644
--- a/src/build_server/CommonProject.rb
+++ b/src/build_server/CommonProject.rb
@@ -48,6 +48,7 @@ class CommonProject
 		@status = status
 		@source_info = {}
 		@package_info = {}
+		@is_transferred = false
 		if @dist_name == "BASE" then
 			@path = "#{@server.path}/projects/#{@name}"
 		else
@@ -67,11 +68,17 @@ class CommonProject
 	end
 
 
+    def set_transferred()
+        @is_transferred = true
+    end
+
+
 	def is_transferred? 
-		return @name == "TRANSFERRED"
+		return @is_transferred
 	end
 
 
+
 	def set_source_info(info)
 		@source_info = info
 	end
diff --git a/src/build_server/ProjectManager.rb b/src/build_server/ProjectManager.rb
index aab83f4..720a93c 100644
--- a/src/build_server/ProjectManager.rb
+++ b/src/build_server/ProjectManager.rb
@@ -385,8 +385,11 @@ class ProjectManager
 
 
 	# this project will not be saved on DB
-	def create_transferred_git_project(repos, dist_name, os)
-		return GitBuildProject.new(nil, @server, [os], dist_name, repos, "master")
+	def create_transferred_git_project(repos, dist_name, os, project_name, git_branch)
+		newPrj = GitBuildProject.new(project_name, @server, [os], dist_name, repos, git_branch)
+        newPrj.set_transferred()
+
+        return newPrj
 	end
 
 
diff --git a/src/build_server/RemoteBuilder.rb b/src/build_server/RemoteBuilder.rb
index a960a1e..90a5267 100644
--- a/src/build_server/RemoteBuilder.rb
+++ b/src/build_server/RemoteBuilder.rb
@@ -81,6 +81,8 @@ class RemoteBuilder
 		options[:dock] = Utils.create_uniq_name()
 		options[:save] = @job.is_rev_build_check_job() ? false : true
 		options[:pkgsvr_url] = @job.server.distmgr.get_distribution(options[:dist]).pkgsvr_url
+        options[:project_name] = @job.get_project().name
+        options[:git_branch] = @job.get_project().branch
 		ret = build( options )
 
 		# reset job
@@ -199,6 +201,8 @@ class RemoteBuilder
 		options[:async] = false
 		options[:monitor_level] = Log::LV_NORMAL
 		options[:pkgsvr_url] = nil
+        options[:project_name] = nil
+        options[:git_branch] = nil
 
 		return options
 	end
@@ -307,7 +311,8 @@ class RemoteBuilder
 				msg = "BUILD|GIT|#{options[:git_repos]}||#{options[:os]}|NO|"+
 					"#{options[:noreverse] ? "YES" : "NO"}|#{options[:dist]}|"+
 					"#{options[:user]}|NO|YES|#{options[:is_rev_build] ? "YES":"NO"}|"+
-					"#{commit}|#{pkg_list}|#{options[:dock]}|#{options[:pkgsvr_url]}"
+					"#{commit}|#{pkg_list}|#{options[:dock]}|#{options[:pkgsvr_url]}|"+
+                    "#{options[:project_name]}|#{options[:git_branch]}"
 			else
 				# format: BUILD|GIT|project_list|passwd|
 				#         os|async|
diff --git a/src/build_server/SocketJobRequestListener.rb b/src/build_server/SocketJobRequestListener.rb
index 5a1644d..d6d0e1f 100644
--- a/src/build_server/SocketJobRequestListener.rb
+++ b/src/build_server/SocketJobRequestListener.rb
@@ -205,7 +205,7 @@ class SocketJobRequestListener
 
 		#          0  | 1 |     2      |  3   |  4    |  5  |     6    |    7    |   8      |   9   |   10   |    11   |  12  | 13 |   14
 		# Case1. BUILD|GIT|project_name|passwd|os_list|async|no_reverse|dist_name|user_email|rebuild
-		# Case2. BUILD|GIT|git_repos   |      |os     |async|no_reverse|dist_name|user_email|rebuild|internal|rev_build|commit|pkgs|dock_num
+		# Case2. BUILD|GIT|git_repos   |      |os     |async|no_reverse|dist_name|user_email|rebuild|internal|rev_build|commit|pkgs|dock_num|pkgsvr_url|project_name|git_branch
 
 		# parse
 		project_name_list = tok[2].split(",")
@@ -222,6 +222,8 @@ class SocketJobRequestListener
 		pkg_files = (not tok[13].nil? and not tok[13].empty?) ? tok[13].split(",") : []
 		dock_num = (not tok[14].nil? and not tok[14].empty?) ? tok[14].strip : "0"
 		pkgsvr_url = (not tok[15].nil? and not tok[15].empty?) ? tok[15].strip : nil
+		project_name = (not tok[16].nil? and not tok[16].empty?) ? tok[16].strip : nil
+		git_branch = (not tok[17].nil? and not tok[17].empty?) ? tok[17].strip : nil
 		if (dist_name.nil? or dist_name.empty?) then
 			dist_name = @parent_server.distmgr.get_default_distribution_name()
 		end
@@ -291,7 +293,7 @@ class SocketJobRequestListener
 			git_repos = project_name_list[0]
 			os = os_list[0]
 
-			new_job = create_new_transferred_job(git_repos, os, git_commit, pkg_files, dock_num, dist_name, pkgsvr_url )
+			new_job = create_new_transferred_job(git_repos, os, git_commit, pkg_files, dock_num, dist_name, pkgsvr_url, project_name, git_branch )
 			if new_job.nil? then
 				raise BuildServerException.new("ERR006"),"Transfered-Build job"
 			else
@@ -1007,8 +1009,8 @@ class SocketJobRequestListener
 
 
 	private
-	def create_new_transferred_job( git_repos, os, git_commit, pkg_files, dock_num, dist_name, pkgsvr_url )
-		prj = @parent_server.prjmgr.create_transferred_git_project( git_repos, dist_name, os )
+	def create_new_transferred_job( git_repos, os, git_commit, pkg_files, dock_num, dist_name, pkgsvr_url, project_name, git_branch )
+		prj = @parent_server.prjmgr.create_transferred_git_project( git_repos, dist_name, os, project_name, git_branch )
 		new_job = prj.create_new_job(os)
 		new_job.set_package_server_url(pkgsvr_url)
 		new_job.set_verified( true )
diff --git a/test/build-server.multi-svr1/01.testcase b/test/build-server.multi-svr1/01.testcase
index 384b21b..1aec4db 100644
--- a/test/build-server.multi-svr1/01.testcase
+++ b/test/build-server.multi-svr1/01.testcase
@@ -31,7 +31,7 @@ Info: Copying result files to
 Info:  *
 Info: Job is completed!
 Info: Job is FINISHED successfully!
-Info: Updating the source info for project "TRANSFERRED"
+Info: Updating the source info for project "testa"
 Info: Receiving file from remote server : a_0.0.1_ubuntu-32.zip
 Info: Checking reverse build dependency ...
 Info: Uploading ...
diff --git a/test/build-server.multi-svr1/02.testcase b/test/build-server.multi-svr1/02.testcase
index 40c07a4..721dee7 100644
--- a/test/build-server.multi-svr1/02.testcase
+++ b/test/build-server.multi-svr1/02.testcase
@@ -35,7 +35,7 @@ Info: Copying result files to
 Info:  *
 Info: Job is completed!
 Info: Job is FINISHED successfully!
-Info: Updating the source info for project "TRANSFERRED"
+Info: Updating the source info for project "testb"
 Info: Receiving file from remote server : b_0.0.1_ubuntu-32.zip
 Info: Checking reverse build dependency ...
 Info: Uploading ...
-- 
2.34.1