[Title] Changed DB schema of supported os

diff --git a/src/build_server/BuildServer.rb b/src/build_server/BuildServer.rb
index d1c159bb0f57b727e31ccc9304e46a688ceee196..8502470ad34211322b5f737bab82f6f6ace0a268 100644 (file)
--- a/src/build_server/BuildServer.rb
+++ b/src/build_server/BuildServer.rb
@@ -319,10 +319,13 @@ class BuildServer
        # add new target OS.
        # If already exist, return false , otherwise true
        def add_supported_os( os_name )
+               os_category = Utils.get_os_category( os_name )
+               if os_category.nil? then return false end
+
                get_db_connection() do |db|
                        row = db.select_one("SELECT * FROM supported_os WHERE name='#{os_name}'")
                        if not row.nil? then return false end
-                       db.do "INSERT INTO supported_os VALUES ('#{os_name}')"
+                       db.do "INSERT INTO supported_os(os_category_id, name) SELECT os_category.id, '#{os_name}' FROM os_category WHERE os_category.name='#{os_category}'"
                end
 
                return true
@@ -540,10 +543,15 @@ class BuildServer
                        db.do "INSERT INTO server_configs (db_version,max_working_job,send_mail,job_keep_time,pkg_sync_period,changelog_check,job_log_url)
                                        VALUES('#{@db_version}','#{@jobmgr.max_working_jobs}','#{@send_mail}','#{@keep_time}','#{@pkg_sync_period}','#{@changelog_check.to_s.upcase}','#{@job_log_url}')"
                        db.do "CREATE TABLE os_category ( id INTEGER PRIMARY KEY #{inc}, name VARCHAR(32) NOT NULL UNIQUE ) #{post_fix}"
+                       db.do "INSERT INTO os_category (name) VALUES ( 'linux' )"
+                       db.do "INSERT INTO os_category (name) VALUES ( 'windows' )"
+                       db.do "INSERT INTO os_category (name) VALUES ( 'macos' )"
+
                        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) NOT NULL UNIQUE, description VARCHAR(256) )#{post_fix}"
                        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)"
+                       db.do "CREATE TABLE supported_os ( id INTEGER PRIMARY KEY #{inc}, os_category_id INTEGER NOT NULL, name VARCHAR(32) NOT NULL UNIQUE,
+                    CONSTRAINT fk_supported_os_os_category1 FOREIGN KEY ( os_category_id ) REFERENCES os_category ( id ) ) #{post_fix}"
 
                        # USERS/GROUPS
                        # users

diff --git a/test/build-server.basic2/build-svr-06.testcase b/test/build-server.basic2/build-svr-06.testcase
index b4c65d40a332fda2358698d435446a744ffe59fa..b3f62fe65ce859a51538cf03790c94fc9079cb95 100644 (file)
--- a/test/build-server.basic2/build-svr-06.testcase
+++ b/test/build-server.basic2/build-svr-06.testcase
@@ -7,4 +7,5 @@ cd buildsvr01; ../../../build-svr create -n testserver3 -u `pwd`/../pkgsvr01/uns
 ../../build-svr remove -n testserver3
 rm -rf buildsvr01
 #EXPECT
+generating
 Server is not running!

diff --git a/test/build-server.basic2/build-svr-11.testcase b/test/build-server.basic2/build-svr-11.testcase
index b80a207e4fb4c9c2ebaeb4d6098d33f35ea65979..0b2f3991d13626a499fa7fa0ce24cd01a4bdafff 100644 (file)
--- a/test/build-server.basic2/build-svr-11.testcase
+++ b/test/build-server.basic2/build-svr-11.testcase
@@ -3,7 +3,7 @@ rm -rf buildsvr01
 mkdir buildsvr01
 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
+../../build-svr add-os -n testserver3 -o ubuntu-32
 #EXEC
 ../../build-svr add-prj -n testserver3 -N testa -g test_git -b test_branch
 #POST-EXEC

diff --git a/test/build-server.basic2/build-svr-14.testcase b/test/build-server.basic2/build-svr-14.testcase
index 972e3f6e9554e06f5a0790e49c1128ee89e87a99..ce59935d590c65ee3700600756993fe09ac74356 100644 (file)
--- a/test/build-server.basic2/build-svr-14.testcase
+++ b/test/build-server.basic2/build-svr-14.testcase
@@ -4,9 +4,9 @@ rm -rf ~/.build_tools/build_server/testserver3
 mkdir buildsvr01
 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
+../../build-svr add-os -n testserver3 -o ubuntu-32
 #EXEC
-../../build-svr add-prj -n testserver3 -N testx -g test_git -b test_branch -o linux
+../../build-svr add-prj -n testserver3 -N testx -g test_git -b test_branch -o ubuntu-32
 #POST-EXEC
 ../../build-svr remove -n testserver3
 rm -rf buildsvr01

diff --git a/test/build-server.basic2/build-svr-15.testcase b/test/build-server.basic2/build-svr-15.testcase
index dfdbfbcbf094accfcd6f858de88f7fe47a94c315..734b5a7baa61ad4f0cebcc2c9b40f9a54adabfc0 100644 (file)
--- a/test/build-server.basic2/build-svr-15.testcase
+++ b/test/build-server.basic2/build-svr-15.testcase
@@ -3,7 +3,7 @@ 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
 #EXEC
-../../build-svr register -n testserver3 -P bin/bin_0.0.0_linux.zip
+../../build-svr register -n testserver3 -P bin/bin_0.0.0_ubuntu-32.zip
 #POST-EXEC
 ../../build-svr remove -n testserver3
 rm -rf buildsvr01

diff --git a/test/build-server.basic2/build-svr-16.testcase b/test/build-server.basic2/build-svr-16.testcase
index 4271351ed13159c46af8c79bb91d7fc4c5084bf8..b5fe4fc09428021de4a2939b8e6135622ac43dbd 100644 (file)
--- a/test/build-server.basic2/build-svr-16.testcase
+++ b/test/build-server.basic2/build-svr-16.testcase
@@ -2,9 +2,9 @@
 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
-../../build-svr register -n testserver3 -P bin/bin_0.0.0_linux.zip
+../../build-svr register -n testserver3 -P bin/bin_0.0.0_ubuntu-32.zip
 #EXEC
-../../build-svr register -n testserver3 -P bin/bin_0.0.0_linux.zip
+../../build-svr register -n testserver3 -P bin/bin_0.0.0_ubuntu-32.zip
 #POST-EXEC
 ../../build-svr remove -n testserver3
 rm -rf buildsvr01

diff --git a/test/build-server.basic2/build-svr-17.testcase b/test/build-server.basic2/build-svr-17.testcase
index 1408c9348946ffb2ce5abdae7b3dd6c100502812..244ce632f14366442c230e0b11ffeeea3fadebfa 100644 (file)
--- a/test/build-server.basic2/build-svr-17.testcase
+++ b/test/build-server.basic2/build-svr-17.testcase
@@ -4,7 +4,7 @@ mkdir buildsvr01
 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 add-os -n testserver3 -o ubuntu-32
 ../../build-svr query -n testserver3
 #POST-EXEC
 ../../build-svr remove -n testserver3
@@ -14,7 +14,7 @@ Target OS is added successfully!
 * REMOTE SERVER(S) *
 
 * SUPPORTED OS *
-* linux
+* ubuntu-32
 
 * DISTRIBUTION(S) *
 * BASE

diff --git a/test/build-server.basic2/build-svr-18.testcase b/test/build-server.basic2/build-svr-18.testcase
index 1412b076b1c776102e763b415a18c4fbe2f57b3d..d2517eed0fa30a222cdf0b5fd622615cea5a8610 100644 (file)
--- a/test/build-server.basic2/build-svr-18.testcase
+++ b/test/build-server.basic2/build-svr-18.testcase
@@ -3,11 +3,12 @@ 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
 #EXEC
-../../build-svr add-os -n testserver3 -o linux
-../../build-svr add-os -n testserver3 -o linux
+../../build-svr add-os -n testserver3 -o ubuntu-32
+../../build-svr add-os -n testserver3 -o ubuntu-32
 #POST-EXEC
 ../../build-svr remove -n testserver3
 rm -rf buildsvr01
 #EXPECT
+generating
 Target OS is added successfully!
 Target OS already exists in list!

diff --git a/test/build-server.basic2/build-svr-19.testcase b/test/build-server.basic2/build-svr-19.testcase
index 6ec96758600abf2aab5b3efc2ef2fa7cd18a7c8e..5a7ce72d94bf72cd7dee92170ae237665ea747d7 100644 (file)
--- a/test/build-server.basic2/build-svr-19.testcase
+++ b/test/build-server.basic2/build-svr-19.testcase
@@ -2,8 +2,8 @@
 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
-../../build-svr add-os -n testserver3 -o linux
-../../build-svr add-os -n testserver3 -o windows
+../../build-svr add-os -n testserver3 -o ubuntu-32
+../../build-svr add-os -n testserver3 -o windows-32
 #EXEC
 ../../build-svr add-prj -n testserver3 -N new_project -g new_git -b new_branch -o wrong_os_name
 #POST-EXEC
@@ -12,5 +12,5 @@ rm -rf buildsvr01
 #EXPECT
 Unsupported OS name "wrong_os_name" is used!
 Check the following supported OS list:
- * linux
- * windows
+ * ubuntu-32
+ * windows-32

diff --git a/test/build-server.basic2/build-svr-20.testcase b/test/build-server.basic2/build-svr-20.testcase
index b225e6ee004ca6725b8a5a640efc3f37fbae9030..1396b9c4da26da258361fd343034383d05f80289 100644 (file)
--- a/test/build-server.basic2/build-svr-20.testcase
+++ b/test/build-server.basic2/build-svr-20.testcase
@@ -3,9 +3,9 @@ rm -rf buildsvr01
 mkdir buildsvr01
 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
+../../build-svr add-os -n testserver3 -o ubuntu-32
 mkdir -p bin
-cp ../bin/bin_0.0.0_linux.zip bin/bin_0.0.0_wrongosname.zip
+cp ../bin/bin_0.0.0_ubuntu-32.zip bin/bin_0.0.0_wrongosname.zip
 ../../build-svr start -n testserver3 -p 2223 &
 #EXEC
 sleep 1