commit: f63159abf956813a831b561cf4ab7a0215fc3cb6
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 13:26:49 2016 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 13:26:49 2016 +0000
URL:
https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=f63159ab
add support for irker host in tbc config
pym/tbc/build_log.py | 4 ++--
pym/tbc/db_mapping.py | 3 ++-
pym/tbc/irk.py | 6 +++---
sql/data_dump.sql | 4 ++--
sql/structure_dump.sql | 3 ++-
5 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/pym/tbc/build_log.py b/pym/tbc/build_log.py
index d053d57..5476592 100644
--- a/pym/tbc/build_log.py
+++ b/pym/tbc/build_log.py
@@ -327,9 +327,9 @@ def add_buildlog_main(settings, pkg, trees):
else:
build_msg = "BUILD: FAILD"
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,)
+ 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.WebIrker, log_id,)
write_log(session, msg, "info", config_id,
'build_log.add_buildlog_main')
- send_irk(msg)
+ send_irk(msg, tbc_config.HostIrker)
session.close
def log_fail_queru(session, build_dict, settings):
diff --git a/pym/tbc/db_mapping.py b/pym/tbc/db_mapping.py
index 34ac324..d3fead1 100644
--- a/pym/tbc/db_mapping.py
+++ b/pym/tbc/db_mapping.py
@@ -292,6 +292,7 @@ class EbuildsMetadata(Base):
class TbcConfig(Base):
Id = Column('id', Integer, primary_key=True)
- WebIker = Column('webinker', String)
+ WebIrker = Column('webirker', String)
+ HostIrker = Column('hostirker', String)
WebBug = Column('webbug', String)
__tablename__ = 'tbc_config'
diff --git a/pym/tbc/irk.py b/pym/tbc/irk.py
index 01765c7..3186cb5 100644
--- a/pym/tbc/irk.py
+++ b/pym/tbc/irk.py
@@ -20,9 +20,9 @@ def irk(target, message, server = DEFAULT_SERVER):
send(s, target, message)
s.close()
-def send_irk(msg):
+def send_irk(msg, host):
target = "tinderbox-cluster"
try:
- irk(target, msg)
+ irk(target, msg, server = host)
except socket.error as e:
- sys.stderr.write("irk: write to server failed: %r\n" % e)
\ No newline at end of file
+ sys.stderr.write("irk: write to server failed: %r\n" % e)
diff --git a/sql/data_dump.sql b/sql/data_dump.sql
index c452356..46102b5 100644
--- a/sql/data_dump.sql
+++ b/sql/data_dump.sql
@@ -185,8 +185,8 @@ INSERT INTO `setups` (`setup_id`, `setup`, `profile`) VALUES
-- Dumping data for table `tbc_config`
--
-INSERT INTO `tbc_config` (`id`, `webinker`, `webbug`) VALUES
-(1, '77.110.8.76', 'bugs.gentoo.org');
+INSERT INTO `tbc_config` (`id`, `webirker`, `hostirker`, `webbug`) VALUES
+(1, '77.110.8.76', '192.168.1.4', 'bugs.gentoo.org');
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
diff --git a/sql/structure_dump.sql b/sql/structure_dump.sql
index e9443c0..2a6f847 100644
--- a/sql/structure_dump.sql
+++ b/sql/structure_dump.sql
@@ -578,7 +578,8 @@ CREATE TABLE IF NOT EXISTS `setups` (
CREATE TABLE IF NOT EXISTS `tbc_config` (
`id` int(11) NOT NULL,
- `webinker` varchar(100) NOT NULL,
+ `webirker` varchar(100) NOT NULL,
+ `hostirker` varchar(100) NOT NULL,
`webbug` varchar(100) NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
