summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@mapreri.org>2015-05-03 11:29:03 +0200
committerHolger Levsen <holger@layer-acht.org>2015-05-03 11:41:13 +0200
commit70fb72c8253b3fa9343ddb576d52e9976f817578 (patch)
treefc72c63afa39de77397d831643df620f19f5b6a3 /bin
parent58906a76de46cbb5f3839504262ac5ef87b70aec (diff)
downloadjenkins.debian.net-70fb72c8253b3fa9343ddb576d52e9976f817578.tar.xz
reproducible: move the code to call kgb and relay messagess to common.py
Diffstat (limited to 'bin')
-rwxr-xr-xbin/reproducible_common.py7
-rwxr-xr-xbin/reproducible_notes.py6
-rwxr-xr-xbin/reproducible_scheduler.py5
3 files changed, 10 insertions, 8 deletions
diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py
index cea16cfa..6dedc05a 100755
--- a/bin/reproducible_common.py
+++ b/bin/reproducible_common.py
@@ -21,6 +21,7 @@ import datetime
import psycopg2
import html as HTML
from string import Template
+from subprocess import call
from traceback import print_exception
DEBUG = False
@@ -499,6 +500,12 @@ def get_trailing_bug_icon(bug, bugs, package=None):
pass
return html
+def irc_msg(msg):
+ kgb = ['kgb-client', '--conf', '/srv/jenkins/kgb/debian-reproducible.conf',
+ '--relay-msg']
+ kgb.extend(str(msg).strip().split())
+ call(kgb)
+
# init the databases connections
conn_db = start_db_connection() # the local sqlite3 reproducible db
# get_bugs() is the only user of this, let it initialize the connection itself,
diff --git a/bin/reproducible_notes.py b/bin/reproducible_notes.py
index d8276635..307774a6 100755
--- a/bin/reproducible_notes.py
+++ b/bin/reproducible_notes.py
@@ -13,7 +13,6 @@ import json
import yaml
from apt_pkg import version_compare
from reproducible_common import *
-from subprocess import call
NOTES = 'packages.yml'
ISSUES = 'issues.yml'
@@ -50,9 +49,8 @@ def load_notes():
print_critical_message('Warning: This query produces no results: ' + query
+ '\nThis means there is no tested ' +
'package with the name ' + pkg)
- kgb = ['kgb-client', '--conf', '/srv/jenkins/kgb/debian-reproducible.conf',
- '--relay-msg', 'There is problem with the note for '+pkg+' - please investigate' ]
- call(kgb)
+ irc_msg('There is problem with the note for ' + pkg +
+ ' - please investigate')
else:
notes[pkg] = []
for suite in result:
diff --git a/bin/reproducible_scheduler.py b/bin/reproducible_scheduler.py
index e65e8365..01bbc33b 100755
--- a/bin/reproducible_scheduler.py
+++ b/bin/reproducible_scheduler.py
@@ -296,10 +296,7 @@ def scheduler():
'for ' + str(total) + ' or ' + \
'+'.join([str(now_queued_here[x]) for x in SUITES]) + ' packages in total.'
log.info(message)
- kgb = ['kgb-client', '--conf', '/srv/jenkins/kgb/debian-reproducible.conf',
- '--relay-msg']
- kgb.extend(message.split())
- call(kgb)
+ irc_msg(message)
log.info('\n\n\n')
log.info(message)