Merge branch 'dibsweb2' into develop

Conflicts:
	src/build_server/CommonJob.rb
	src/build_server/GitBuildJob.rb
	src/build_server/PackageSync.rb
	src/build_server/SocketJobRequestListener.rb

Change-Id: Iab002b9b4f447f2ee287f1af09d6b41fa46e347b

diff --cc build-cli
Simple merge

diff --cc src/build_server/BinaryUploadProject.rb
Simple merge

diff --cc src/build_server/BuildJob.rb
Simple merge

diff --cc src/build_server/BuildServer.rb
Simple merge

diff --cc src/build_server/CommonJob.rb
index 72624c084df7e45f2d63b030cddda0cf59a98616,50151aac994401f41ca4a1bca985c509bde3b302..1b7e4b466b9b85d1675ff2b8985e0a6b8a4d5332
--- 1/src/build_server/CommonJob.rb
--- 2/src/build_server/CommonJob.rb
+++ b/src/build_server/CommonJob.rb
@@@ -33,9 -34,7 +34,10 @@@ require "utils.rb
  
  class CommonJob
  
 -      attr_accessor :id, :server, :log, :os, :type, :pre_jobs, :status, :user_id
 +      attr_accessor :id, :server, :log, :status, :priority
++      attr_accessor :os, :type, :pre_jobs, :user_id
 +      USER_JOB_PRIORITY = 100
 +      AUTO_JOB_PRIORITY = 0
  
        # initialize
        public
@@@ -49,7 -48,12 +51,13 @@@
  
                @parent = nil
                @sub_jobs = []
 +              @priority = USER_JOB_PRIORITY # higher numbered job get priority
+               @os = "Unknown"
+               @type = "Unknown"
+               @pre_jobs = [] #pre-requisite jobs
+               @project = nil
+               @user_id = 1
+ 
                @status = "JUST_CREATED"
                @log = nil
  

diff --cc src/build_server/GitBuildJob.rb
Simple merge

diff --cc src/build_server/JobClean.rb
Simple merge

diff --cc src/build_server/JobManager.rb
Simple merge

diff --cc src/build_server/MultiBuildJob.rb
Simple merge

diff --cc src/build_server/PackageSync.rb
index c0df1e65bae1f09e7b7112faf1a4e754ab6f459b,c15ff42411e74fa5c9f2af5a2fa45bbafd4bbd39..c842cddb84f69bfd94242042dd20d009eb3cb10c
--- 1/src/build_server/PackageSync.rb
--- 2/src/build_server/PackageSync.rb
+++ b/src/build_server/PackageSync.rb
@@@ -91,25 -94,25 +94,25 @@@ class PackageSyncAction < Actio
                # if updates are found, download them
                downloaded_files = []
                pkgs.each do  |pkg|
-                       pkg_name=pkg[0]; os=pkg[1]
- 
-                       files = @pkgsvr_client.download(pkg_name, os, false)
-                       downloaded_files += files
-               end
- 
-               # request to register
-               registered_jobs = []
-               downloaded_files.each do  |file_path|
-                       @server.log.info "Creating new job for registering \"#{file_path}\""
-                       new_job = @server.jobmgr.create_new_register_job( file_path, @dist_name )
-                       new_job.priority = CommonJob::AUTO_JOB_PRIORITY
-                       logger = JobLog.new( new_job, nil )
-                       new_job.set_logger(logger)
-                       logger.init
- 
-                       # add
-                       @server.jobmgr.add_job( new_job )
-                       registered_jobs.push new_job
+                       pkg_name=pkg[0]; os=pkg[1]; prj=pkg[2]
+ 
+                       downloaded_files = @pkgsvr_client.download(pkg_name, os, false)
+                       downloaded_files.each do  |file_path|
+                               @server.log.info "Creating new job for registering \"#{file_path}\""
 -                              new_job = prj.create_new_job_from_local_file( file_path )
++                              new_job = @server.jobmgr.create_new_register_job( file_path, @dist_name )
+                               if new_job.nil? then
+                                       @server.log.error "Creating job failed: #{prj.name} #{pkg_name} #{@dist_name}"
+                                       next
+                               end
 -                                      
++                              new_job.priority = CommonJob::AUTO_JOB_PRIORITY
+                               logger = JobLog.new( new_job, nil )
+                               new_job.set_logger(logger)
+                               logger.init
+ 
+                               # add
+                               @server.jobmgr.add_job( new_job )
+                               registered_jobs.push new_job
+                       end
                end
  
                # wait for finish all jobs

diff --cc src/build_server/RegisterPackageJob.rb
Simple merge

diff --cc src/build_server/SocketJobRequestListener.rb
index df176ba123364e9cea2865b6ca79323ea1bca7dc,81fef09dedc8b8909e1ddb1da3f785299bcee7ff..b491ecb69d01c536dc6041f1372081706a39e149
--- 1/src/build_server/SocketJobRequestListener.rb
--- 2/src/build_server/SocketJobRequestListener.rb
+++ b/src/build_server/SocketJobRequestListener.rb
@@@ -272,13 -312,7 +312,14 @@@ class SocketJobRequestListene
                        raise "No valid jobs!"
                end
  
-                       req.puts "Error: Creating job failed!"
 +              if new_job.nil? then
 +                      BuildCommServer.send_begin(req)
++                      req.puts "Error: Creating job failed! (project may not exist)"
 +                      BuildCommServer.send_end(req)
 +                      raise "Internal Error!"
 +              end
 +
+               # check reverse build
                if no_reverse then new_job.set_no_reverse end
  
                # create logger and set
@@@ -480,10 -537,10 +544,10 @@@
                when "PROJECT"
                        BuildCommServer.send_begin(req)
                        # print GIT projects
-                       sorted_list = @parent_server.prjmgr.projects.sort { |x,y| x.name <=> y.name }
+                       sorted_list = @parent_server.prjmgr.get_all_projects().sort { |x,y| x.name <=> y.name }
                        sorted_list.each do |prj|
                                if prj.type != "GIT" then next end
 -                              BuildCommServer.send(req,"G,#{prj.name},#{prj.repository},#{prj.branch}")
 +                              BuildCommServer.send(req,"G,#{prj.name},#{prj.dist_name},#{prj.repository},#{prj.branch}")
                        end
                        # print BINARY projects
                        sorted_list.each do |prj|

diff --cc src/common/log.rb
Simple merge

diff --cc test/build-server.multi-svr2/01.testcase
index 0000000000000000000000000000000000000000,13a91dc4b4676fe404401401f82c23fc925663c9..05095f5453aaadf81170a69a89c8db2c1a732496
mode 000000,100644..100644
--- /dev/null
--- 2/test/build-server.multi-svr2/01.testcase
+++ b/test/build-server.multi-svr2/01.testcase
@@@ -1,0 -1,12 +1,22 @@@
+ #PRE-EXEC
+ #EXEC
+ ../../pkg-svr register -n pkgsvr02 -d unstable -P bin/bin_0.0.1_ubuntu-32.zip
+ sleep 50
+ ../../pkg-cli list-rpkg -P bin -u `pwd`/pkgsvr01/unstable
+ #POST-EXEC
+ #EXPECT
+ Archive:  bin/bin_0.0.1_ubuntu-32.zip
+ inflating:
+ snapshot is generated :
+ package registed successfully
++I, [
++I, [
++I, [
++I, [
++I, [
++I, [
++I, [
++I, [
++I, [
++I, [
+ bin  (0.0.1)

diff --cc test/build-server.multi_dist2/build-svr3-03.testcase
index f4ed2ec28c44a518b45febb3b74a3ee57483983b,f4ed2ec28c44a518b45febb3b74a3ee57483983b..be7df44ec28e5cfd3e5f141981e15a825946eba6
--- 1/test/build-server.multi_dist2/build-svr3-03.testcase
--- 2/test/build-server.multi_dist2/build-svr3-03.testcase
+++ b/test/build-server.multi_dist2/build-svr3-03.testcase
@@@ -3,6 -3,6 +3,19 @@@
  ../../build-cli register -d 127.0.0.1:2223 -P bin/bin_0.0.0_ubuntu-32.zip -D unstable2 -t ftp://ftpuser:ftpuser@127.0.0.1
  #POST-EXEC
  #EXPECT
++I, [
++I, [
++I, [
++I, [
++I, [
++I, [
++I, [
++I, [
++I, [
++I, [
++I, [
++I, [
++I, [
  Info: Added new job
  Info: Initializing job...
  Info: Checking package version ...