commit: 14b0918ae227f4135477946c8e6c9d9919b56fbf
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 10 20:25:25 2016 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Wed Feb 10 20:25:25 2016 +0000
URL:
https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=14b0918a
fix so we mark any error as fail and some small fixes
pym/tbc/build_log.py | 11 +++++++----
pym/tbc/db_mapping.py | 6 ++++++
pym/tbc/package.py | 2 +-
pym/tbc/sqlquerys.py | 8 ++++++--
4 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/pym/tbc/build_log.py b/pym/tbc/build_log.py
index c70dc76..8b6ef0b 100644
--- a/pym/tbc/build_log.py
+++ b/pym/tbc/build_log.py
@@ -30,7 +30,7 @@ from tbc.sqlquerys import get_config_id, get_ebuild_id_db,
add_new_buildlog, \
get_package_info, get_build_job_id, get_use_id, get_config_info,
get_hilight_info, get_error_info_list, \
add_e_info, get_fail_times, add_fail_times, update_fail_times,
del_old_build_jobs, add_old_ebuild, \
update_buildjobs_status, add_repoman_qa, get_config_id_fqdn,
get_setup_info, \
- add_repoman_log
+ add_repoman_log, get_tbc_config
from tbc.log import write_log
from sqlalchemy.orm import sessionmaker
@@ -224,13 +224,13 @@ def get_buildlog_info(session, settings, pkg, build_dict,
config_id):
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: # qa = 3 and 4
+ if v['hilight_css_id'] == 3: # qa = 3
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: # qa = 3 and 4
+ if v['hilight_css_id'] == 3: # qa = 3
qa_error_list.append(logfile_text_dict[i])
i = i +1
@@ -245,8 +245,10 @@ def get_buildlog_info(session, settings, pkg, build_dict,
config_id):
build_log_dict['fail'] = False
if repoman_error_list:
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['fail'] = True
else:
qa_error_list = False
for error_log_line in error_log_list:
@@ -324,7 +326,8 @@ def add_buildlog_main(settings, pkg, trees):
qa_msg = "QA: FAILD"
else:
build_msg = "BUILD: FAILD"
- msg = "Package: %s Repo: %s %s %s %s Weblink
http://77.110.8.67/new/logs/build/%s\n"; % (pkg.cpv, pkg.repo, build_msg,
repoman_msg, qa_msg, log_id,)
+ tbc_config = get_tbc_config(session)
+ msg = "Package: %s Repo: %s %s %s %s Weblink
http://%s/new/logs/build/%s\n"; % (pkg.cpv, pkg.repo, build_msg, repoman_msg,
qa_msg, tbc_config.WebIker, log_id,)
write_log(session, msg, "info", config_id,
'build_log.add_buildlog_main')
send_irk(msg)
session.close
diff --git a/pym/tbc/db_mapping.py b/pym/tbc/db_mapping.py
index b0ab23f..9be0d0a 100644
--- a/pym/tbc/db_mapping.py
+++ b/pym/tbc/db_mapping.py
@@ -287,3 +287,9 @@ class EbuildsMetadata(Base):
New = Column('new', Boolean, default=False)
Descriptions = Column('descriptions', Text)
__tablename__ = 'ebuilds_metadata'
+
+class TbcConfig(Base):
+ Id = Column('id', Integer, primary_key=True)
+ WebIker = Column('webinker', String)
+ WebBug = Column('webbug', String)
+ __tablename__ = 'tbc_config'
diff --git a/pym/tbc/package.py b/pym/tbc/package.py
index 510a5d2..c069c7e 100644
--- a/pym/tbc/package.py
+++ b/pym/tbc/package.py
@@ -136,7 +136,7 @@ class tbc_package(object):
attDict['ebuild_version_metadata_tree'] =
ebuild_version_metadata_tree
#attDict['ebuild_version_text_tree'] =
ebuild_version_text_tree[0]
attDict['git_commit'] = git_commit
- attDict['New'] = False
+ attDict['new'] = False
attDict['ebuild_version_descriptions_tree'] =
ebuild_version_metadata_tree[7]
return attDict
diff --git a/pym/tbc/sqlquerys.py b/pym/tbc/sqlquerys.py
index 5a8a183..f9f14a2 100644
--- a/pym/tbc/sqlquerys.py
+++ b/pym/tbc/sqlquerys.py
@@ -9,12 +9,16 @@ from tbc.db_mapping import Configs, Logs, ConfigsMetaData,
Jobs, BuildJobs, Pack
HiLightCss, BuildLogsHiLight, BuildLogsEmergeOptions, BuildLogsErrors,
ErrorsInfo, EmergeInfo, BuildLogsUse, \
BuildJobsEmergeOptions, EbuildsMetadata, EbuildsIUse, Restrictions,
EbuildsRestrictions, EbuildsKeywords, \
Keywords, PackagesMetadata, Emails, PackagesEmails, Setups,
BuildLogsRepoman, CategoriesMetadata, \
- PackagesRepoman, BuildLogsQa
+ PackagesRepoman, BuildLogsQa, TbcConfig
from tbc.log import write_log
from sqlalchemy.orm.exc import NoResultFound, MultipleResultsFound
from sqlalchemy import and_, or_
# Guest Functions
+def get_tbc_config(session):
+ TbcConfigInfo = session.query(TbcConfig).one()
+ return TbcConfigInfo
+
def get_config_id(session, setup, host):
SetupInfo = session.query(Setups).filter_by(Setup = setup).one()
ConfigInfo = session.query(Configs).filter_by(SetupId =
SetupInfo.SetupId).filter_by(Hostname = host).one()
@@ -419,7 +423,7 @@ def add_new_ebuild_sql(session, packageDict):
except (MultipleResultsFound) as e:
# FIXME
sys.exit()
- session.add(EbuildsMetadata(EbuildId = EbuildInfo.EbuildId,
Commit = v['git_commit'], Descriptions = v['ebuild_version_descriptions_tree']))
+ session.add(EbuildsMetadata(EbuildId = EbuildInfo.EbuildId, New
= v['new'], Commit = v['git_commit'], Descriptions =
v['ebuild_version_descriptions_tree']))
session.commit()
ebuild_id_list.append(EbuildInfo.EbuildId)
restrictions = []
