From: donghee yang <donghee.yang@samsung.com>
Date: Mon, 22 Apr 2013 15:05:01 +0000 (+0900)
Subject: [Title] Fixed a bug that local commit id is used
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f76e50b1dfdb8947afe402280bde5c334bac6c5b;p=sdk%2Ftools%2Fsdk-build.git

[Title] Fixed a bug that local commit id is used
---

diff --git a/src/build_server/GitBuildJob.rb b/src/build_server/GitBuildJob.rb
index 3d3c5bd..b66d081 100644
--- a/src/build_server/GitBuildJob.rb
+++ b/src/build_server/GitBuildJob.rb
@@ -271,6 +271,12 @@ class GitBuildJob < BuildJob
 			end
 		end
 
+		# git reset origin operation
+		if File.exist? git_path and not git_cmd("reset --hard origin/#{@git_branch}", git_path,@log) then
+			@log.warn( "Failed on \"git reset --hard origin/#{@git_branch}\"", Log::LV_USER)
+			FileUtils.rm_rf git_path
+		end
+
 		# git pull operation
 		if File.exist? git_path and not git_cmd("pull", git_path,@log) then
 			@log.warn( "Failed on \"git pull\"", Log::LV_USER)
diff --git a/test/build-server.multi-svr1/buildsvr1.init b/test/build-server.multi-svr1/buildsvr1.init
index e4d9802..d333a18 100755
--- a/test/build-server.multi-svr1/buildsvr1.init
+++ b/test/build-server.multi-svr1/buildsvr1.init
@@ -32,7 +32,7 @@ ${RUBY} ../../build-svr add-os -n testserver3 -o ubuntu-32
 ${RUBY} ../../build-svr add-os -n testserver3 -o windows-32
 ${RUBY} ../../build-svr add-prj -n testserver3 -N testa -g `pwd`/git01/a -b master
 ${RUBY} ../../build-svr add-prj -n testserver3 -N testb -g `pwd`/git01/b -b master
-${RUBY} ../../build-svr set-attr -n testserver3 -A MAX_WORKING_JOBS -V 0
+${RUBY} ../../build-svr set-attr -n testserver3 -A MAX_WORKING_JOBS -V 1
 
 mkdir -p git01
 cp ../git01/*.tar.gz git01/