commit: 0b3fb764b2e67d771021d47447121a8836198fd5
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 18:32:34 2016 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 18:32:34 2016 +0000
URL:
https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=0b3fb764
split build_logs_repoman_qa to repoman and qa
pym/tbc/db_mapping.py | 10 ++++++++--
pym/tbc/sqlquerys.py | 17 +++++++----------
sql/structure_dump.sql | 37 ++++++++++++++++++++++++++++++-------
3 files changed, 45 insertions(+), 19 deletions(-)
diff --git a/pym/tbc/db_mapping.py b/pym/tbc/db_mapping.py
index d9fcf25..b0ab23f 100644
--- a/pym/tbc/db_mapping.py
+++ b/pym/tbc/db_mapping.py
@@ -223,11 +223,17 @@ class BuildLogsUse(Base):
Status = Column('status', Boolean, default=False)
__tablename__ = 'build_logs_use'
-class BuildLogsRepomanQa(Base):
+class BuildLogsRepoman(Base):
Id = Column('id', Integer, primary_key=True)
BuildLogId = Column('build_log_id', Integer,
ForeignKey('build_logs.build_log_id'))
SummeryText = Column('summery_text', Text)
- __tablename__ = 'build_logs_repoman_qa'
+ __tablename__ = 'build_logs_repoman'
+
+class BuildLogsQa(Base):
+ Id = Column('id', Integer, primary_key=True)
+ BuildLogId = Column('build_log_id', Integer,
ForeignKey('build_logs.build_log_id'))
+ SummeryText = Column('summery_text', Text)
+ __tablename__ = 'build_logs_qa'
class PackagesRepoman(Base):
Id = Column('id', Integer, primary_key=True)
diff --git a/pym/tbc/sqlquerys.py b/pym/tbc/sqlquerys.py
index 9ada5dd..5a8a183 100644
--- a/pym/tbc/sqlquerys.py
+++ b/pym/tbc/sqlquerys.py
@@ -8,8 +8,8 @@ from tbc.db_mapping import Configs, Logs, ConfigsMetaData,
Jobs, BuildJobs, Pack
Uses, ConfigsEmergeOptions, EmergeOptions, HiLight, BuildLogs,
BuildLogsConfig, BuildJobsUse, BuildJobsRedo, \
HiLightCss, BuildLogsHiLight, BuildLogsEmergeOptions, BuildLogsErrors,
ErrorsInfo, EmergeInfo, BuildLogsUse, \
BuildJobsEmergeOptions, EbuildsMetadata, EbuildsIUse, Restrictions,
EbuildsRestrictions, EbuildsKeywords, \
- Keywords, PackagesMetadata, Emails, PackagesEmails, Setups,
BuildLogsRepomanQa, CategoriesMetadata, \
- PackagesRepoman
+ Keywords, PackagesMetadata, Emails, PackagesEmails, Setups,
BuildLogsRepoman, CategoriesMetadata, \
+ PackagesRepoman, BuildLogsQa
from tbc.log import write_log
from sqlalchemy.orm.exc import NoResultFound, MultipleResultsFound
from sqlalchemy import and_, or_
@@ -280,20 +280,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
+ NewBuildLogRepoman = BuildLogsRepoman(BuildLogId = log_id,
SummeryText = repoman_error)
+ session.add(NewBuildLogRepoman)
+ session.commit()
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)
+ NewBuildLogQa = BuildLogsQa(BuildLogId = log_id, SummeryText =
qa_error)
+ session.add(NewBuildLogQa)
session.commit()
def update_fail_times(session, FailInfo):
diff --git a/sql/structure_dump.sql b/sql/structure_dump.sql
index 194c8ee..9c2f397 100644
--- a/sql/structure_dump.sql
+++ b/sql/structure_dump.sql
@@ -3,7 +3,7 @@
-- http://www.phpmyadmin.net
--
-- Host: localhost
--- Generation Time: Jan 31, 2016 at 01:39 PM
+-- Generation Time: Jan 31, 2016 at 06:07 PM
-- Server version: 10.0.22-MariaDB-log
-- PHP Version: 5.6.16-pl0-gentoo
@@ -173,10 +173,22 @@ CREATE TABLE IF NOT EXISTS `build_logs_hilight` (
-- --------------------------------------------------------
--
--- Table structure for table `build_logs_repoman_qa`
+-- Table structure for table `build_logs_qa`
--
-CREATE TABLE IF NOT EXISTS `build_logs_repoman_qa` (
+CREATE TABLE IF NOT EXISTS `build_logs_qa` (
+`id` int(11) NOT NULL,
+ `build_log_id` int(11) NOT NULL,
+ `summery_text` text NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `build_logs_repoman`
+--
+
+CREATE TABLE IF NOT EXISTS `build_logs_repoman` (
`id` int(11) NOT NULL,
`build_log_id` int(11) NOT NULL,
`summery_text` text NOT NULL
@@ -607,9 +619,15 @@ ALTER TABLE `build_logs_hilight`
ADD PRIMARY KEY (`id`), ADD KEY `log_id` (`log_id`), ADD KEY `hilight_id`
(`hilight_css_id`), ADD KEY `hilight_css_id` (`hilight_css_id`);
--
--- Indexes for table `build_logs_repoman_qa`
+-- Indexes for table `build_logs_qa`
+--
+ALTER TABLE `build_logs_qa`
+ ADD PRIMARY KEY (`id`), ADD KEY `build_logs_id` (`build_log_id`);
+
+--
+-- Indexes for table `build_logs_repoman`
--
-ALTER TABLE `build_logs_repoman_qa`
+ALTER TABLE `build_logs_repoman`
ADD PRIMARY KEY (`id`), ADD KEY `build_logs_id` (`build_log_id`);
--
@@ -830,9 +848,14 @@ MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
ALTER TABLE `build_logs_hilight`
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
--
--- AUTO_INCREMENT for table `build_logs_repoman_qa`
+-- AUTO_INCREMENT for table `build_logs_qa`
+--
+ALTER TABLE `build_logs_qa`
+MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
+--
+-- AUTO_INCREMENT for table `build_logs_repoman`
--
-ALTER TABLE `build_logs_repoman_qa`
+ALTER TABLE `build_logs_repoman`
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;
--
-- AUTO_INCREMENT for table `build_logs_use`
