[gentoo-commits] proj/tinderbox-cluster:master commit in: tbc/pym/

[Magnus Granberg]

commit:     63bc5f7ccb24c1d40ffeea6ccb9002f323e75a7b
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 24 00:25:35 2015 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Fri Jul 24 00:25:35 2015 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=63bc5f7c

fix repoman qa and error logning

 tbc/pym/build_log.py  | 22 +++++++++-------------
 tbc/pym/db_mapping.py |  2 --
 tbc/pym/package.py    |  2 +-
 tbc/pym/sqlquerys.py  |  7 ++++++-
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/tbc/pym/build_log.py b/tbc/pym/build_log.py
index ffa848a..8079443 100644
--- a/tbc/pym/build_log.py
+++ b/tbc/pym/build_log.py
@@ -193,14 +193,14 @@ def get_buildlog_info(session, settings, pkg, build_dict):
 	error_info_list = get_error_info_list(session)
 	for k, v in sorted(hilight_dict.items()):
 		if v['startline'] == v['endline']:
-			error_log_list.append(logfile_text_dict[k ])
-			if v['hilight_css_id'] == "3" or v['hilight_css_id'] == "4": # qa = 3 and 4
+			error_log_list.append(logfile_text_dict[k])
+			if v['hilight_css_id'] == 3: # qa = 3 and 4
 				qa_error_list.append(logfile_text_dict[k])
 		else:
 			i = k
 			while i != (v['endline'] + 1):
 				error_log_list.append(logfile_text_dict[i])
-				if v['hilight_css_id'] == "3" or v['hilight_css_id'] == "4": # qa = 3 and 4
+				if v['hilight_css_id'] == 3: # qa = 3 and 4
 					qa_error_list.append(logfile_text_dict[i])
 				i = i +1
 
@@ -208,14 +208,12 @@ def get_buildlog_info(session, settings, pkg, build_dict):
 	repoman_error_list = check_repoman(settings, myportdb, build_dict['cpv'], pkg.repo)
 	build_log_dict = {}
 	build_log_dict['fail'] = False
-	build_log_dict['rmqa'] = False
-	build_log_dict['others'] = False
 	if repoman_error_list:
-		sum_build_log_list.append("1") # repoman = 1
-		build_log_dict['rmqa'] = True
+		sum_build_log_list.append(1) # repoman = 1
+		build_log_dict['fail'] = True
 	if qa_error_list != []:
-		sum_build_log_list.append("2") # qa = 2
-		build_log_dict['rmqa'] = True
+		sum_build_log_list.append(2) # qa = 2
+		build_log_dict['fail'] = True
 	else:
 		qa_error_list = False
 	error_search_line = "^ \\* ERROR: "
@@ -299,7 +297,7 @@ def log_fail_queru(session, build_dict, settings):
 		build_log_dict = {}
 		error_log_list = []
 		sum_build_log_list = []
-		sum_build_log_list.append("2")
+		sum_build_log_list.append(3) # Others errors
 		error_log_list.append(build_dict['type_fail'])
 		build_log_dict['summary_error_list'] = sum_build_log_list
 		if build_dict['type_fail'] == 'merge fail':
@@ -335,8 +333,6 @@ def log_fail_queru(session, build_dict, settings):
 			build_log_dict['hilight_dict'] = {}
 		settings2, trees, tmp = load_emerge_config()
 		build_log_dict['emerge_info'] = get_emerge_info_id(settings2, trees, session, config_id)
-		build_log_dict['others'] = True
-		build_log_dict['rmqa'] = False
-		build_log_dict['fail'] = False
+		build_log_dict['fail'] = True
 		log_id = add_new_buildlog(session, build_dict, build_log_dict)
 		del_old_build_jobs(session, build_dict['build_job_id'])

diff --git a/tbc/pym/db_mapping.py b/tbc/pym/db_mapping.py
index 67c2d61..a296c2e 100644
--- a/tbc/pym/db_mapping.py
+++ b/tbc/pym/db_mapping.py
@@ -183,8 +183,6 @@ class BuildLogs(Base):
 	BuildLogId = Column('build_log_id', Integer, primary_key=True)
 	EbuildId = Column('ebuild_id', Integer, ForeignKey('ebuilds.ebuild_id'))
 	Fail = Column('fail', Boolean, default=False)
-	RmQa = Column('rmqa', Boolean, default=False)
-	Others = Column('others', Boolean, default=False)
 	SummeryText = Column('summery_text', Text)
 	LogHash = Column('log_hash', String(100))
 	BugId = Column('bug_id', Integer, default=0)

diff --git a/tbc/pym/package.py b/tbc/pym/package.py
index dc4ff3e..cc03f97 100644
--- a/tbc/pym/package.py
+++ b/tbc/pym/package.py
@@ -157,7 +157,7 @@ class tbc_package(object):
 						log_msg = "B %s:%s USE: %s Setup: %s" % (k, v['repo'], use_flagsDict, setup_id,)
 						add_logs(self._session, log_msg, "info", self._config_id)
 					i = i +1
-	def get_changelog_text(self,pkgdir):
+	def get_changelog_text(self, pkgdir):
 		changelog_text_dict, max_text_lines = get_log_text_dict(pkgdir + "/ChangeLog")
 		spec = 3
 		spec_tmp = 1

diff --git a/tbc/pym/sqlquerys.py b/tbc/pym/sqlquerys.py
index f7f5a97..8fdf901 100644
--- a/tbc/pym/sqlquerys.py
+++ b/tbc/pym/sqlquerys.py
@@ -229,7 +229,7 @@ def add_new_buildlog(session, build_dict, build_log_dict):
 		return None, False
 
 	def build_log_id_no_match(build_dict, build_log_dict):
-		NewBuildLog = BuildLogs(EbuildId = build_dict['ebuild_id'], Fail = build_log_dict['fail'], RmQa = build_log_dict['rmqa'], Others = build_log_dict['others'], SummeryText = build_log_dict['build_error'], LogHash = build_log_dict['log_hash'])
+		NewBuildLog = BuildLogs(EbuildId = build_dict['ebuild_id'], Fail = build_log_dict['fail'], SummeryText = build_log_dict['build_error'], LogHash = build_log_dict['log_hash'])
 		session.add(NewBuildLog)
 		session.flush()
 		build_log_id = NewBuildLog.BuildLogId
@@ -276,12 +276,17 @@ def add_new_buildlog(session, build_dict, build_log_dict):
 def add_repoman_qa(session, build_log_dict, log_id):
 	repoman_error = ""
 	qa_error = ""
+	error = False
 	if build_log_dict['repoman_error_list']:
 		for repoman_text in build_log_dict['repoman_error_list']:
 			repoman_error = repoman_error + repoman_text
+		error = True
 	if build_log_dict['qa_error_list']:
 		for qa_text in build_log_dict['qa_error_list']:
 			qa_error = qa_error + qa_text
+		error = True
+	repoman_error = repoman_error + qa_error
+	if error:
 		repoman_error = repoman_error + qa_error
 		NewBuildLogRepoman = BuildLogsRepomanQa(BuildLogId = log_id, SummeryText = repoman_error)
 		session.add(NewBuildLogRepoman)