From ec0aa37f21f86a8f01f155c95f7cb2a8e665b474 Mon Sep 17 00:00:00 2001 From: "jiil.hyoun" Date: Mon, 29 Oct 2012 16:46:22 +0900 Subject: [PATCH] [Title] db migrate [Type] Feature [Module] Toolchain / [Priority] Major [Jira#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] Change-Id: Id5df4a443c9f2a576542e013b46d9f3e0b1883f4 --- build-svr | 17 +--- src/build_server/BuildServer.rb | 89 ++++++++++++++----- src/build_server/BuildServerController.rb | 52 ++++++++--- src/build_server/BuildServerOptionParser.rb | 28 +++++- test/build-server.basic1/buildsvr.init | 4 +- .../build-server.basic2/build-svr-02.testcase | 7 +- .../build-server.basic2/build-svr-03.testcase | 3 +- .../build-server.basic2/build-svr-05.testcase | 3 +- .../build-server.basic2/build-svr-11.testcase | 3 +- .../build-server.basic2/build-svr-13.testcase | 3 +- .../build-server.basic2/build-svr-14.testcase | 3 +- .../build-server.basic2/build-svr-17.testcase | 3 +- .../build-server.basic2/build-svr-20.testcase | 3 +- 13 files changed, 157 insertions(+), 61 deletions(-) diff --git a/build-svr b/build-svr index 5e1bb74..06cef66 100755 --- a/build-svr +++ b/build-svr @@ -67,22 +67,11 @@ begin ftpsvr_username = ftp_result[2] ftpsvr_passwd = ftp_result[3] end - pkgsvr_url = pkgsvr_addr = pkgsvr_port = nil - if not option[:domain].nil? and not option[:url].nil? then - svr_result = Utils.parse_server_addr(option[:domain]) - if svr_result.nil? or svr_result.length != 2 then - puts "Server address is incorrect. (#{option[:domain]})" - puts "Tune as following format." - puts " :" - exit 1 - end - pkgsvr_url = option[:url] - pkgsvr_addr = svr_result[0] - pkgsvr_port = svr_result[1] - end - BuildServerController.create_server( option[:name], Utils::WORKING_DIR, ftpsvr_addr, ftpsvr_port, ftpsvr_username, ftpsvr_passwd, pkgsvr_url, pkgsvr_addr, pkgsvr_port ) + BuildServerController.create_server( option[:name], Utils::WORKING_DIR, ftpsvr_addr, ftpsvr_port, ftpsvr_username, ftpsvr_passwd ) when "remove" BuildServerController.remove_server( option[:name] ) + when "migrate" + BuildServerController.migrate_server( option[:name], option[:db_dsn], option[:db_user], option[:db_passwd] ) when "start" if( option[:child] ) then # Child Process BuildServerController.start_server( option[:name], option[:port] ) diff --git a/src/build_server/BuildServer.rb b/src/build_server/BuildServer.rb index cd3b160..4fddc08 100644 --- a/src/build_server/BuildServer.rb +++ b/src/build_server/BuildServer.rb @@ -64,7 +64,7 @@ class BuildServer attr_accessor :pkg_sync_period attr_accessor :changelog_check attr_accessor :db - attr_accessor :db_dsn, :db_user, :db_passwd + attr_accessor :db_dsn, :db_user, :db_passwd, :db_version CONFIG_ROOT = "#{Utils::HOME}/.build_tools/build_server" HOST_OS = Utils::HOST_OS @@ -115,6 +115,11 @@ class BuildServer @db_dsn = "SQLite3:#{BuildServer::CONFIG_ROOT}/#{@id}/server.db" @db_user = nil @db_passwd = nil + @db_version = 1 + + #DB upgrade SQL command + @db_migrate = [] + #@db_migrate[0]= ["CREATE TABLE test(value INTEGER)", "INSERT INTO test (value) VALUES('3')"] end @@ -525,13 +530,45 @@ class BuildServer return @jobmgr.has_waiting_jobs end + def get_dbversion + db_version = nil + begin + db = DBI.connect("DBI:#{@db_dsn}", @db_user, @db_passwd) + db_version = db.select_one("SELECT (version) FROM db")[0] + rescue DBI::DatabaseError => e + #puts e.errstr + ensure + db.disconnect if db + end + return db_version + end - def db_exist? - if File.exist? "#{BuildServer::CONFIG_ROOT}/#{@id}/server.db" then - return true - else - return false + def db_upgrade + result = true + create = false + begin + db = DBI.connect("DBI:#{@db_dsn}", @db_user, @db_passwd) + db_version = db.select_one("SELECT (version) FROM db")[0] + if db_version.nil? then + create = true + else + list = @db_migrate[db_version..@db_version] + if not list.nil? then + list.each do |sql_list| + sql_list.each do |sql| + db.do sql + end + end + end + end + rescue DBI::DatabaseError => e + puts e.errstr + result = false + ensure + db.disconnect if db end + if create then create_db end + return result end @@ -547,27 +584,34 @@ class BuildServer else inc="AUTOINCREMENT" end + # remove table + db.tables.each do |table| + db.do "DROP TABLE #{table}" + end + # create table - db.do "CREATE TABLE IF NOT EXISTS distributions(name VARCHAR(32) PRIMARY KEY, pkgsvr_url VARCHAR(256), pkgsvr_addr VARCHAR(64), status VARCHAR(32) DEFAULT 'OPEN')" - db.do "CREATE TABLE IF NOT EXISTS remote_build_servers(id INTEGER PRIMARY KEY #{inc}, svr_addr VARCHAR(64))" - db.do "CREATE TABLE IF NOT EXISTS sync_pkg_servers(id INTEGER PRIMARY KEY #{inc}, pkgsvr_url VARCHAR(256), period INTEGER, dist_name VARCHAR(32))" - db.do "CREATE TABLE IF NOT EXISTS supported_os(name VARCHAR(32) PRIMARY KEY)" + db.do "CREATE TABLE db(version INTEGER )" + db.do "INSERT INTO db (version) VALUES('#{@db_version}')" + db.do "CREATE TABLE distributions(name VARCHAR(32) PRIMARY KEY, pkgsvr_url VARCHAR(256), pkgsvr_addr VARCHAR(64), status VARCHAR(32) DEFAULT 'OPEN')" + db.do "CREATE TABLE remote_build_servers(id INTEGER PRIMARY KEY #{inc}, svr_addr VARCHAR(64))" + db.do "CREATE TABLE sync_pkg_servers(id INTEGER PRIMARY KEY #{inc}, pkgsvr_url VARCHAR(256), period INTEGER, dist_name VARCHAR(32))" + db.do "CREATE TABLE supported_os(name VARCHAR(32) PRIMARY KEY)" # USERS/GROUPS - db.do "CREATE TABLE IF NOT EXISTS users(id INTEGER PRIMARY KEY #{inc}, email VARCHAR(256), password_hash VARCHAR(256), password_salt VARCHAR(256), name VARCHAR(256), group_id INTEGER)" - db.do "CREATE TABLE IF NOT EXISTS groups(id INTEGER PRIMARY KEY #{inc}, name VARCHAR(256))" - db.do "CREATE TABLE IF NOT EXISTS group_project_accesses(group_id INTEGER, prj_id INTEGER, build VARCHAR(32))" + db.do "CREATE TABLE users(id INTEGER PRIMARY KEY #{inc}, email VARCHAR(256), password_hash VARCHAR(256), password_salt VARCHAR(256), name VARCHAR(256), group_id INTEGER)" + db.do "CREATE TABLE groups(id INTEGER PRIMARY KEY #{inc}, name VARCHAR(256))" + db.do "CREATE TABLE group_project_accesses(group_id INTEGER, prj_id INTEGER, build VARCHAR(32))" # PROJECTS - db.do "CREATE TABLE IF NOT EXISTS projects(id INTEGER PRIMARY KEY #{inc}, name VARCHAR(32), ptype VARCHAR(32), password VARCHAR(32), dist_name VARCHAR(32))" - db.do "CREATE TABLE IF NOT EXISTS project_os(prj_id INTEGER, os_name VARCHAR(32))" - db.do "CREATE TABLE IF NOT EXISTS project_gits(prj_id INTEGER, git_repos VARCHAR(128), git_branch VARCHAR(32))" - db.do "CREATE TABLE IF NOT EXISTS project_sources(prj_id INTEGER, pkg_ver VARCHAR(64), location VARCHAR(256))" - db.do "CREATE TABLE IF NOT EXISTS project_bins(prj_id INTEGER, pkg_name VARCHAR(64))" - db.do "CREATE TABLE IF NOT EXISTS project_packages(prj_id INTEGER, pkg_ver VARCHAR(64), pkg_name VARCHAR(64), pkg_os VARCHAR(32))" + db.do "CREATE TABLE projects(id INTEGER PRIMARY KEY #{inc}, name VARCHAR(32), ptype VARCHAR(32), password VARCHAR(32), dist_name VARCHAR(32))" + db.do "CREATE TABLE project_os(prj_id INTEGER, os_name VARCHAR(32))" + db.do "CREATE TABLE project_gits(prj_id INTEGER, git_repos VARCHAR(128), git_branch VARCHAR(32))" + db.do "CREATE TABLE project_sources(prj_id INTEGER, pkg_ver VARCHAR(64), location VARCHAR(256))" + db.do "CREATE TABLE project_bins(prj_id INTEGER, pkg_name VARCHAR(64))" + db.do "CREATE TABLE project_packages(prj_id INTEGER, pkg_ver VARCHAR(64), pkg_name VARCHAR(64), pkg_os VARCHAR(32))" # JOBS - db.do "CREATE TABLE IF NOT EXISTS jobs(id INTEGER PRIMARY KEY, jtype VARCHAR(32), os_name VARCHAR(32), user_id INTEGER, parent_job_id INTEGER, status VARCHAR(32), prj_id INTEGER, dist_name VARCHAR(32), start_time VARCHAR(32), end_time VARCHAR(32) )" + db.do "CREATE TABLE jobs(id INTEGER PRIMARY KEY, jtype VARCHAR(32), os_name VARCHAR(32), user_id INTEGER, parent_job_id INTEGER, status VARCHAR(32), prj_id INTEGER, dist_name VARCHAR(32), start_time VARCHAR(32), end_time VARCHAR(32) )" rescue DBI::DatabaseError => e puts "DB Creation failed!" @@ -582,8 +626,8 @@ class BuildServer def get_db_connection() if not @db.nil? and @db.connected? then return @db end - if not @db.nil? then - @db.disconnect + if not @db.nil? then + @db.disconnect @db = nil end @@ -602,6 +646,5 @@ class BuildServer @db = db return @db end - end diff --git a/src/build_server/BuildServerController.rb b/src/build_server/BuildServerController.rb index 180d0bf..8e60081 100644 --- a/src/build_server/BuildServerController.rb +++ b/src/build_server/BuildServerController.rb @@ -34,7 +34,7 @@ class BuildServerController @@instance_map = {} # create - def self.create_server (id, path, ftpsvr_addr=nil, ftpsvr_port=nil, ftpsvr_username=nil, ftpsvr_passwd=nil, pkgsvr_url=nil, pkgsvr_addr=nil, pkgsvr_port=3333 ) + def self.create_server (id, path, ftpsvr_addr=nil, ftpsvr_port=nil, ftpsvr_username=nil, ftpsvr_passwd=nil) # check server config root check_build_server_root @@ -62,11 +62,6 @@ class BuildServerController # set logger @@instance_map[id].log = Log.new( "#{BuildServer::CONFIG_ROOT}/#{id}/log" ) - # add distribution - if not pkgsvr_url.nil? then - @@instance_map[id].distmgr.add_distribution("BASE", pkgsvr_url, pkgsvr_addr, pkgsvr_port) - end - puts "Created new build server: \"#{id}\"" return @@instance_map[id] end @@ -87,6 +82,24 @@ class BuildServerController end end + def self.migrate_server (id, dsn, user, passwd) + # set DB environment + server = get_server(id) + server.db_dsn = dsn if not dsn.nil? + server.db_user = user if not user.nil? + server.db_passwd = passwd if not passwd.nil? + + # check db + if migrate_db(server) then + write_server_config(server) + end + end + + def self.migrate_db (server) + version = server.get_dbversion + if version.nil? then server.create_db end + return server.db_upgrade + end # get def self.get_server( id ) @@ -114,6 +127,7 @@ class BuildServerController # start server def self.start_server( id, port = 2222 ) server = get_server(id) + migrate_db(server) # write run port server_dir = "#{BuildServer::CONFIG_ROOT}/#{server.id}" @@ -132,6 +146,7 @@ class BuildServerController # server server = get_server(id) + migrate_db(server) client = BuildCommClient.create( "127.0.0.1", server.port ) if client.nil? then puts "Server is not running!" @@ -169,6 +184,7 @@ class BuildServerController # server server = get_server(id) + migrate_db(server) client = BuildCommClient.create( "127.0.0.1", server.port ) if client.nil? then puts "Server is not running!" @@ -205,6 +221,7 @@ class BuildServerController def self.request_upgrade_server( id ) server = get_server(id) + migrate_db(server) server_dir = "#{BuildServer::CONFIG_ROOT}/#{id}" if File.exist? "#{server_dir}/friends" then @@ -256,6 +273,7 @@ class BuildServerController # add friend server def self.add_remote_server( id, ip, port ) server = get_server(id) + migrate_db(server) # add if server.add_remote_server( ip, port ) then @@ -271,6 +289,7 @@ class BuildServerController # remove friend server def self.remove_remote_server( id, ip, port ) server = get_server(id) + migrate_db(server) # add if server.remove_remote_server( ip, port ) then @@ -287,6 +306,7 @@ class BuildServerController def self.add_target_os( id, os_name ) # get server server = get_server(id) + migrate_db(server) # add if server.add_supported_os( os_name ) then @@ -303,6 +323,7 @@ class BuildServerController def self.remove_target_os( id, os_name ) # get server server = get_server(id) + migrate_db(server) # add if server.remove_supported_os( os_name ) then @@ -321,6 +342,7 @@ class BuildServerController def self.add_distribution( id, dist_name, pkgsvr_url, pkgsvr_ip, pkgsvr_port ) # get server server = get_server(id) + migrate_db(server) # add if server.distmgr.add_distribution( dist_name, pkgsvr_url, pkgsvr_ip, pkgsvr_port ) then @@ -337,6 +359,7 @@ class BuildServerController def self.remove_distribution( id, dist_name ) # get server server = get_server(id) + migrate_db(server) # remove if server.distmgr.remove_distribution( dist_name ) then @@ -353,6 +376,7 @@ class BuildServerController def self.lock_distribution(id, dist_name) # get server server = get_server(id) + migrate_db(server) # remove if server.distmgr.set_distribution_lock(dist_name, true) then @@ -369,6 +393,7 @@ class BuildServerController def self.unlock_distribution(id, dist_name) # get server server = get_server(id) + migrate_db(server) # remove if server.distmgr.set_distribution_lock(dist_name, false) then @@ -384,6 +409,7 @@ class BuildServerController # add remote package server def self.add_sync_package_server(id, url, dist_name) server = get_server(id) + migrate_db(server) # check distribution dist_name = check_distribution_name(dist_name, server) @@ -415,6 +441,7 @@ class BuildServerController # remove remote package server def self.remove_sync_package_server(id, url, dist_name) server = get_server(id) + migrate_db(server) # check distribution dist_name = check_distribution_name(dist_name, server) @@ -436,6 +463,7 @@ class BuildServerController passwd, os_string, dist_name ) # get server server = get_server(id) + migrate_db(server) # get supported os for project. # if not specified, all supported os of the server will be used @@ -483,6 +511,7 @@ class BuildServerController def self.add_binary_project( id, project_name, pkg_name, passwd, os_string, dist_name ) # get server server = get_server(id) + migrate_db(server) # get supported os for project. # if not specified, all supported os of the server will be used @@ -525,6 +554,7 @@ class BuildServerController def self.remove_project( id, project_name, dist_name ) # get server server = get_server(id) + migrate_db(server) # check distribution dist_name = check_distribution_name(dist_name, server) @@ -546,6 +576,7 @@ class BuildServerController # server server = get_server(id) + migrate_db(server) # check distribution dist_name = check_distribution_name(dist_name, server) @@ -591,6 +622,7 @@ class BuildServerController def self.register_package(id, file_path, dist_name) # server server = get_server(id) + migrate_db(server) # check distribution dist_name = check_distribution_name(dist_name, server) @@ -637,6 +669,7 @@ class BuildServerController # server def self.query_server( id ) server = get_server(id) + migrate_db(server) server.prjmgr.load() puts "* REMOTE SERVER(S) *" @@ -825,11 +858,6 @@ class BuildServerController f.puts "DB_USER=#{server.db_user}" f.puts "DB_PASSWORD=#{server.db_passwd}" end - - # save to server.db - if not server.db_exist? then - server.create_db() - end end @@ -949,7 +977,7 @@ class BuildServerController obj.db_passwd = db_passwd # save config - write_server_config( obj ) + #write_server_config( obj ) # create object & return it return obj diff --git a/src/build_server/BuildServerOptionParser.rb b/src/build_server/BuildServerOptionParser.rb index 83c496d..bcfb5d9 100644 --- a/src/build_server/BuildServerOptionParser.rb +++ b/src/build_server/BuildServerOptionParser.rb @@ -31,8 +31,9 @@ require 'optparse' require 'utils' class BuildServerUsage - CREATE="build-svr create -n [-t ] [-u -d ]" + CREATE="build-svr create -n [-t ]" REMOVE="build-svr remove -n " + MIGRATE="build-svr migrate -n [--dsn [--dbuser --dbpassword ] ]" START="build-svr start -n -p " STOP="build-svr stop -n " UPGRADE="build-svr upgrade -n " @@ -68,6 +69,11 @@ def option_error_check( options ) raise ArgumentError, "Usage: " + BuildServerUsage::REMOVE end + when "migrate" + if options[:name].nil? or options[:name].empty? then + raise ArgumentError, "Usage: " + BuildServerUsage::MIGRATE + end + when "start" if options[:name].nil? or options[:name].empty? or options[:port].nil? then @@ -199,6 +205,7 @@ def option_parse + "\n" + "Subcommands:" + "\n" \ + "\t" + "create Create the build-server." + "\n" \ + "\t" + "remove Remove the build-server." + "\n" \ + + "\t" + "migrate build-server DB migrate." + "\n" \ + "\t" + "start Start the build-server." + "\n" \ + "\t" + "stop Stop the build-server." + "\n" \ + "\t" + "upgrade Upgrade the build-server include friends." + "\n" \ @@ -222,6 +229,7 @@ def option_parse + "\n" + "Subcommand usage:" + "\n" \ + "\t" + BuildServerUsage::CREATE + "\n" \ + "\t" + BuildServerUsage::REMOVE + "\n" \ + + "\t" + BuildServerUsage::MIGRATE + "\n" \ + "\t" + BuildServerUsage::START + "\n" \ + "\t" + BuildServerUsage::STOP + "\n" \ + "\t" + BuildServerUsage::UPGRADE + "\n" \ @@ -313,6 +321,22 @@ def option_parse options[:attr] = attr end + options[:db_dsn] = nil + opts.on( '--dsn ', 'Data Source Name ex) mysql:host=localhost;database=test' ) do |dsn| + options[:db_dsn] = dsn + end + + options[:db_user] = nil + opts.on( '--dbuser ', 'DB user id' ) do |user| + options[:db_user] = user + end + + options[:db_passwd] = nil + opts.on( '--dbpassword ', 'DB password' ) do |password| + options[:db_passwd] = password + end + + opts.on( '-V', '--value ', 'value' ) do |value| options[:value] = value end @@ -336,7 +360,7 @@ def option_parse cmd = ARGV[0] if cmd.eql? "create" or cmd.eql? "remove" or cmd.eql? "start" or cmd.eql? "upgrade" or - cmd.eql? "stop" or + cmd.eql? "stop" or cmd.eql? "migrate" or cmd.eql? "add-svr" or cmd.eql? "remove-svr" or cmd.eql? "add-os" or cmd.eql? "remove-os" or cmd.eql? "add-dist" or cmd.eql? "remove-dist" or diff --git a/test/build-server.basic1/buildsvr.init b/test/build-server.basic1/buildsvr.init index 354c0ce..9432b2b 100755 --- a/test/build-server.basic1/buildsvr.init +++ b/test/build-server.basic1/buildsvr.init @@ -10,9 +10,9 @@ rm -rf ~/.build_tools/build_server/testserver3 ../../build-svr remove -n testserver3 mkdir buildsvr01 cd buildsvr01 -${RUBY} ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 +${RUBY} ../../../build-svr create -n testserver3 cd .. - +${RUBY} ../../build-svr add-dist -n testserver3 -D BASE -u `pwd`/pkgsvr01/unstable -d 127.0.0.1:3333 ${RUBY} ../../build-svr add-svr -n testserver3 -d 127.0.0.1:2224 ${RUBY} ../../build-svr add-os -n testserver3 -o ubuntu-32 ${RUBY} ../../build-svr add-os -n testserver3 -o windows-32 diff --git a/test/build-server.basic2/build-svr-02.testcase b/test/build-server.basic2/build-svr-02.testcase index 86f59ed..271b3c0 100644 --- a/test/build-server.basic2/build-svr-02.testcase +++ b/test/build-server.basic2/build-svr-02.testcase @@ -10,6 +10,7 @@ Usage: build-svr [OPTS] or build-svr (-h|-v) Subcommands: create Create the build-server. remove Remove the build-server. +migrate build-server DB migrate. start Start the build-server. stop Stop the build-server. upgrade Upgrade the build-server include friends. @@ -32,8 +33,9 @@ set-attr Set build server atribute. get-attr Get build server atribute. Subcommand usage: -build-svr create -n [-t ] [-u -d ] +build-svr create -n [-t ] build-svr remove -n +build-svr migrate -n [--dsn [--dbuser --dbpassword ] ] build-svr start -n -p build-svr stop -n build-svr upgrade -n @@ -69,6 +71,9 @@ Options: -w, --passwd password for managing project -t, --ftp ftp server url: ftp://dibsftp:dibsftp@127.0.0.1:1024 -A, --attr attribute +--dsn Data Source Name ex) mysql:host=localhost;database=test +--dbuser DB user id +--dbpassword DB password -V, --value value -h, --help display this information -v, --version display version diff --git a/test/build-server.basic2/build-svr-03.testcase b/test/build-server.basic2/build-svr-03.testcase index b95b1ee..236a9ef 100644 --- a/test/build-server.basic2/build-svr-03.testcase +++ b/test/build-server.basic2/build-svr-03.testcase @@ -1,7 +1,8 @@ #PRE-EXEC rm -rf buildsvr01 mkdir buildsvr01 -cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 +cd buildsvr01; ../../../build-svr create -n testserver3 -t ftp://dibsftp:coreps2@172.21.111.132 +cd buildsvr01; ../../../build-svr add-dist -n testserver3 -D BASE -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 #EXEC ../../build-svr add-svr -n testserver3 -d 127.0.0.1:2223 ../../build-svr query -n testserver3 diff --git a/test/build-server.basic2/build-svr-05.testcase b/test/build-server.basic2/build-svr-05.testcase index 7e5f10b..23d530f 100644 --- a/test/build-server.basic2/build-svr-05.testcase +++ b/test/build-server.basic2/build-svr-05.testcase @@ -1,7 +1,8 @@ #PRE-EXEC mkdir buildsvr01 rm -rf ~/.build_tools/build_server/testserver3 -cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 +cd buildsvr01; ../../../build-svr create -n testserver3 -t ftp://dibsftp:coreps2@172.21.111.132 +cd buildsvr01; ../../../build-svr add-dist -n testserver3 -D BASE -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 ../../build-svr start -n testserver3 -p 2223 & #EXEC sleep 1 diff --git a/test/build-server.basic2/build-svr-11.testcase b/test/build-server.basic2/build-svr-11.testcase index 77fd62e..b80a207 100644 --- a/test/build-server.basic2/build-svr-11.testcase +++ b/test/build-server.basic2/build-svr-11.testcase @@ -1,7 +1,8 @@ #PRE-EXEC rm -rf buildsvr01 mkdir buildsvr01 -cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 +cd buildsvr01; ../../../build-svr create -n testserver3 -t ftp://dibsftp:coreps2@172.21.111.132 +cd buildsvr01; ../../../build-svr add-dist -n testserver3 -D BASE -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 ../../build-svr add-os -n testserver3 -o linux #EXEC ../../build-svr add-prj -n testserver3 -N testa -g test_git -b test_branch diff --git a/test/build-server.basic2/build-svr-13.testcase b/test/build-server.basic2/build-svr-13.testcase index de77d15..f87355b 100644 --- a/test/build-server.basic2/build-svr-13.testcase +++ b/test/build-server.basic2/build-svr-13.testcase @@ -1,7 +1,8 @@ #PRE-EXEC rm -rf buildsvr01 mkdir buildsvr01 -cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 +cd buildsvr01; ../../../build-svr create -n testserver3 -t ftp://dibsftp:coreps2@172.21.111.132 +cd buildsvr01; ../../../build-svr add-dist -n testserver3 -D BASE -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 #EXEC ../../build-svr add-prj -n testserver3 -N testa -g test_git -b test_branch -w 1111 #POST-EXEC diff --git a/test/build-server.basic2/build-svr-14.testcase b/test/build-server.basic2/build-svr-14.testcase index 20e84d6..972e3f6 100644 --- a/test/build-server.basic2/build-svr-14.testcase +++ b/test/build-server.basic2/build-svr-14.testcase @@ -2,7 +2,8 @@ rm -rf buildsvr01 rm -rf ~/.build_tools/build_server/testserver3 mkdir buildsvr01 -cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://ftpuser:ftpuser@127.0.0.1 +cd buildsvr01; ../../../build-svr create -n testserver3 -t ftp://ftpuser:ftpuser@127.0.0.1 +cd buildsvr01; ../../../build-svr add-dist -n testserver3 -D BASE -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 ../../build-svr add-os -n testserver3 -o linux #EXEC ../../build-svr add-prj -n testserver3 -N testx -g test_git -b test_branch -o linux diff --git a/test/build-server.basic2/build-svr-17.testcase b/test/build-server.basic2/build-svr-17.testcase index 4f71ef8..1408c93 100644 --- a/test/build-server.basic2/build-svr-17.testcase +++ b/test/build-server.basic2/build-svr-17.testcase @@ -1,7 +1,8 @@ #PRE-EXEC rm -rf buildsvr01 mkdir buildsvr01 -cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://dibsftp:coreps2@172.21.111.132 +cd buildsvr01; ../../../build-svr create -n testserver3 -t ftp://dibsftp:coreps2@172.21.111.132 +cd buildsvr01; ../../../build-svr add-dist -n testserver3 -D BASE -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 #EXEC ../../build-svr add-os -n testserver3 -o linux ../../build-svr query -n testserver3 diff --git a/test/build-server.basic2/build-svr-20.testcase b/test/build-server.basic2/build-svr-20.testcase index 65f5b30..b225e6e 100644 --- a/test/build-server.basic2/build-svr-20.testcase +++ b/test/build-server.basic2/build-svr-20.testcase @@ -1,7 +1,8 @@ #PRE-EXEC rm -rf buildsvr01 mkdir buildsvr01 -cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 -t ftp://ftpuser:ftpuser@172.21.111.124 +cd buildsvr01; ../../../build-svr create -n testserver3 -t ftp://ftpuser:ftpuser@172.21.111.124 +cd buildsvr01; ../../../build-svr add-dist -n testserver3 -D BASE -u `pwd`/../pkgsvr01/unstable -d 127.0.0.1:3333 ../../build-svr add-os -n testserver3 -o linux mkdir -p bin cp ../bin/bin_0.0.0_linux.zip bin/bin_0.0.0_wrongosname.zip -- 2.34.1