[gentoo-commits] dev/zorry:master commit in: gobs/bin/, ebuild/dev-python/gobs/, ebuild/dev-python/gobs/files/, gobs/pym/

[Magnus Granberg]

commit:     058f9eb48cedcf6ce1cf193c753a0f34b98cb5a4
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 29 16:31:42 2012 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sun Apr 29 16:31:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=058f9eb4

adding add/del build querys for configs

---
 ebuild/dev-python/gobs/files/gobs.conf             |    2 +-
 ebuild/dev-python/gobs/gobs-9999.ebuild            |    1 -
 gobs/bin/gobs_host_jobs                            |   21 +++++
 gobs/bin/gobs_setup_profile                        |   20 -----
 .../pym/{init_setup_profile.py => buildquerydb.py} |   79 +++++++++-----------
 5 files changed, 57 insertions(+), 66 deletions(-)

diff --git a/ebuild/dev-python/gobs/files/gobs.conf b/ebuild/dev-python/gobs/files/gobs.conf
index 5650449..9ed7a41 100644
--- a/ebuild/dev-python/gobs/files/gobs.conf
+++ b/ebuild/dev-python/gobs/files/gobs.conf
@@ -10,6 +10,6 @@ SQLUSER=buildhost
 SQLPASSWD=buildhost
 # Gobs git repo name for the setups/configs
 GOBSGITREPONAME=tinderboxs_configs
-GOBSCONFIG=jasmin.ume.nu/hardened
+GOBSCONFIG=localhost/base
 # Main logfile
 LOGFILE=/var/log/gobs

diff --git a/ebuild/dev-python/gobs/gobs-9999.ebuild b/ebuild/dev-python/gobs/gobs-9999.ebuild
index 1a6fc3d..808e491 100644
--- a/ebuild/dev-python/gobs/gobs-9999.ebuild
+++ b/ebuild/dev-python/gobs/gobs-9999.ebuild
@@ -35,7 +35,6 @@ src_install() {
 	insinto /etc/gobs
 	doins ${FILESDIR}/gobs.conf || die
 	dobin ${S}/gobs/sbin/gobs_host_jobs || die
-	dobin ${S}/gobs/bin/gobs_setup_profile || die
 	dosbin  ${S}/gobs/sbin/gobs_buildquerys || die
 	dodoc ${S}/gobs/sql/pgdump.sql.gz || die
 	dodoc  ${S}/gobs/doc/Setup.txt || die

diff --git a/gobs/bin/gobs_host_jobs b/gobs/bin/gobs_host_jobs
index 0cd5396..09189d7 100755
--- a/gobs/bin/gobs_host_jobs
+++ b/gobs/bin/gobs_host_jobs
@@ -7,6 +7,7 @@ from __future__ import print_function
 from gobs.init_setup_profile import setup_profile_main
 from gobs.readconf import get_conf_settings
 from gobs.updatedb import update_db_main
+from gobs.buildquerydb import add_buildquery_main, del_buildquery_main
 
 reader = get_conf_settings()
 gobs_settings_dict=reader.read_gobs_settings_all()
@@ -49,6 +50,26 @@ def main():
 				else:
 					update_job_list(conn, "Fail", job[1])
 					logging.info("Job %s did fail. Config: %s", job[0], config_profile)
+				elif job[0] == "addbuildquery":
+					update_job_list(conn, "Runing", job[1])
+					logging.info("Job %s is runing. Config: %s", job[0], config_profile)
+					result =  add_buildquery_main(config_profile)
+					if result is True:
+						update_job_list(conn, "Done", job[1])
+						logging.info("Job %s is done. Config: %s", job[0], config_profile)
+					else:
+						update_job_list(conn, "Fail", job[1])
+						logging.info("Job %s did fail. Config: %s", job[0], config_profile)
+				elif job[0] == "delbuildquery":
+					update_job_list(conn, "Runing", job[1])
+					logging.info("Job %s is runing. Config: %s", job[0], config_profile)
+					result =  del_buildquery_main(config_profile)
+					if result is True:
+						update_job_list(conn, "Done", job[1])
+						logging.info("Job %s is done. Config: %s", job[0], config_profile)
+					else:
+						update_job_list(conn, "Fail", job[1])
+						logging.info("Job %s did fail. Config: %s", job[0], config_profile)
 			repeat = False
 		CM.putConnection(conn)
 		time.sleep(60)

diff --git a/gobs/bin/gobs_setup_profile b/gobs/bin/gobs_setup_profile
deleted file mode 100755
index 9a1dd04..0000000
--- a/gobs/bin/gobs_setup_profile
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/python
-# Copyright 2006-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-from gobs.init_setup_profile import setup_profile_main
-from gobs.readconf import get_conf_settings
-reader = get_conf_settings()
-gobs_settings_dict=reader.read_gobs_settings_all()
-
-import logging
-
-def main():
-	# Main
-	# Logging
-	logging.basicConfig(filename=gobs_settings_dict['gobs_logfile'], \
-	format='%(levelname)s: %(asctime)s %(message)s', level=logging.INFO)
-	setup_profile_main(args=None)
-	
-if __name__ == "__main__":
-	main()
\ No newline at end of file

diff --git a/gobs/pym/init_setup_profile.py b/gobs/pym/buildquerydb.py
similarity index 57%
rename from gobs/pym/init_setup_profile.py
rename to gobs/pym/buildquerydb.py
index 8d19c0b..d383fbc 100644
--- a/gobs/pym/init_setup_profile.py
+++ b/gobs/pym/buildquerydb.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-# Copyright 2006-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 """ 	This code will update the sql backend with needed info for
@@ -60,48 +58,41 @@ def add_cpv_query_pool(mysettings, init_package, config_id, package_line):
 	CM.putConnection(conn)
 	return
 
-def setup_profile_main(args=None):
-	"""
-	@param args: command arguments (default: sys.argv[1:])
-	@type args: list
-	"""
+def add_buildquery_main(config_id):
 	conn=CM.getConnection()
-	if args is None:
-		args = sys.argv[1:]
-	if args[0] == "-add":
-		config_id = args[1]
-		logging.info("Adding build querys for: %s", config_id)
-		git_pull()
-		check_make_conf()
-		logging.info("Check configs done")
-		# Get default config from the configs table  and default_config=1
-		default_config_root = "/var/lib/gobs/" + gobs_settings_dict['gobs_gitreponame'] + "/" + config_id + "/"
-		# Set config_root (PORTAGE_CONFIGROOT)  to default_config_root
-		mysettings = portage.config(config_root = default_config_root)
-		myportdb = portage.portdbapi(mysettings=mysettings)
-		init_package = gobs_package(mysettings, myportdb)
-		# get the cp list
-		package_list_tree = package_list_tree = myportdb.cp_all()
-		logging.info("Setting default config to: %s", config_id)
-		# Use all exept 2 cores when multiprocessing
-		pool_cores= multiprocessing.cpu_count()
-		if pool_cores >= 3:
-			use_pool_cores = pool_cores - 2
-		else:
-			use_pool_cores = 1
-		pool = multiprocessing.Pool(processes=use_pool_cores)
-		for package_line in sorted(package_list_tree):
-			pool.apply_async(add_cpv_query_pool, (mysettings, init_package, config_id, package_line,))
-		pool.close()
-		pool.join()
-		logging.info("Adding build querys for: %s ... Done.", config_id)
+	logging.info("Adding build querys for: %s", config_id)
+	git_pull()
+	check_make_conf()
+	logging.info("Check configs done")
+	# Get default config from the configs table  and default_config=1
+	default_config_root = "/var/lib/gobs/" + gobs_settings_dict['gobs_gitreponame'] + "/" + config_id + "/"
+	# Set config_root (PORTAGE_CONFIGROOT)  to default_config_root
+	mysettings = portage.config(config_root = default_config_root)
+	myportdb = portage.portdbapi(mysettings=mysettings)
+	init_package = gobs_package(mysettings, myportdb)
+	# get the cp list
+	package_list_tree = package_list_tree = myportdb.cp_all()
+	logging.info("Setting default config to: %s", config_id)
+	# Use all exept 2 cores when multiprocessing
+	pool_cores= multiprocessing.cpu_count()
+	if pool_cores >= 3:
+		use_pool_cores = pool_cores - 2
+	else:
+		use_pool_cores = 1
+	pool = multiprocessing.Pool(processes=use_pool_cores)
+	for package_line in sorted(package_list_tree):
+		pool.apply_async(add_cpv_query_pool, (mysettings, init_package, config_id, package_line,))
+	pool.close()
+	pool.join()
+	logging.info("Adding build querys for: %s ... Done.", config_id)
+	return True
 
-	if args[0] == "-del":
-		config_id = args[1]
-		logging.info("Removeing build querys for: %s", config_id)
-		querue_id_list = get_queue_id_list_config(conn, config_id)
-		if querue_id_list is not None:
-			for querue_id in querue_id_list:
-				del_old_queue(conn, querue_id)
-		logging.info("Removeing build querys for: %s ... Done.", config_id)
+def del_buildquery_main(config_id):
+	logging.info("Removeing build querys for: %s", config_id)
+	querue_id_list = get_queue_id_list_config(conn, config_id)
+	if querue_id_list is not None:
+		for querue_id in querue_id_list:
+			del_old_queue(conn, querue_id)
+	logging.info("Removeing build querys for: %s ... Done.", config_id)
 	CM.putConnection(conn)
+	return True