zuul
/
zuul
Code Issues Proposed changes

Remove stray print statements. 

Add tox.ini with pep8 section.

Fix pep8 errors.

Change-Id: I6c171104359b16bcb130fdd56697d0663d8ec562
This commit is contained in:
James E. Blair 2012-05-30 09:15:05 -07:00
parent 0903a4227c
commit 1e8dd893ed
8 changed files with 120 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -14,9 +14,7 @@
# under the License. # under the License.
from setuptools import find_packages from setuptools import find_packages
from setuptools.command.sdist import sdist
from setuptools import setup from setuptools import setup
import subprocess
setup(name='zuul', setup(name='zuul',
version='1.0', version='1.0',

6
tox.ini Normal file
View File

@ -0,0 +1,6 @@
[tox]
envlist = pep8
[testenv:pep8]
deps = pep8
commands = pep8 --repeat --show-source zuul zuul-server setup.py

4
zuul-server
View File

@ -23,12 +23,14 @@ import zuul.trigger.gerrit
import logging.config import logging.config
def parse_arguments(): def parse_arguments():
parser = argparse.ArgumentParser(description='Project gating system.') parser = argparse.ArgumentParser(description='Project gating system.')
parser.add_argument('-c', dest='config', parser.add_argument('-c', dest='config',
help='specify the config file') help='specify the config file')
return parser.parse_args() return parser.parse_args()
def read_config(args): def read_config(args):
config = ConfigParser.ConfigParser() config = ConfigParser.ConfigParser()
if args.config: if args.config:
@ -42,6 +44,7 @@ def read_config(args):
return config return config
raise Exception("Unable to locate config file in %s" % locations) raise Exception("Unable to locate config file in %s" % locations)
def setup_logging(config): def setup_logging(config):
if config.has_option('zuul', 'log_config'): if config.has_option('zuul', 'log_config'):
fp = os.path.expanduser(config.get('zuul', 'log_config')) fp = os.path.expanduser(config.get('zuul', 'log_config'))
@ -51,6 +54,7 @@ def setup_logging(config):
else: else:
logging.basicConfig(level=logging.DEBUG) logging.basicConfig(level=logging.DEBUG)
def main(config): def main(config):
sched = zuul.scheduler.Scheduler(config) sched = zuul.scheduler.Scheduler(config)

46
zuul/launcher/jenkins.py
View File

@ -28,6 +28,7 @@ import pprint
from zuul.model import Build from zuul.model import Build
class JenkinsCallback(threading.Thread): class JenkinsCallback(threading.Thread):
log = logging.getLogger("zuul.JenkinsCallback") log = logging.getLogger("zuul.JenkinsCallback")
@ -61,7 +62,8 @@ class JenkinsCallback(threading.Thread):
uuid = params.get('UUID') uuid = params.get('UUID')
if (status and url and uuid and phase if (status and url and uuid and phase
and phase == 'COMPLETED'): and phase == 'COMPLETED'):
self.jenkins.onBuildCompleted(uuid, status, url, number) self.jenkins.onBuildCompleted(uuid, status, url,
number)
if (phase and phase == 'STARTED'): if (phase and phase == 'STARTED'):
self.jenkins.onBuildStarted(uuid, url, number) self.jenkins.onBuildStarted(uuid, url, number)
@ -70,6 +72,7 @@ STOP_BUILD = 'job/%(name)s/%(number)s/stop'
CANCEL_QUEUE = 'queue/item/%(number)s/cancelQueue' CANCEL_QUEUE = 'queue/item/%(number)s/cancelQueue'
BUILD_INFO = 'job/%(name)s/%(number)s/api/json?depth=0' BUILD_INFO = 'job/%(name)s/%(number)s/api/json?depth=0'
class ExtendedJenkins(jenkins.Jenkins): class ExtendedJenkins(jenkins.Jenkins):
def jenkins_open(self, req): def jenkins_open(self, req):
''' '''
@ -104,10 +107,10 @@ class ExtendedJenkins(jenkins.Jenkins):
''' '''
# Jenkins returns a 302 from this URL, unless Referer is not set, # Jenkins returns a 302 from this URL, unless Referer is not set,
# then you get a 404. # then you get a 404.
self.jenkins_open(urllib2.Request(self.server + CANCEL_QUEUE%locals(), self.jenkins_open(urllib2.Request(self.server +
CANCEL_QUEUE % locals(),
headers={'Referer': self.server})) headers={'Referer': self.server}))
def get_build_info(self, name, number): def get_build_info(self, name, number):
''' '''
Get information for a build. Get information for a build.
@ -118,7 +121,9 @@ class ExtendedJenkins(jenkins.Jenkins):
@type number: int @type number: int
@return: dictionary @return: dictionary
''' '''
return json.loads(self.jenkins_open(urllib2.Request(self.server + BUILD_INFO%locals()))) return json.loads(self.jenkins_open(urllib2.Request(
self.server + BUILD_INFO % locals())))
class Jenkins(object): class Jenkins(object):
log = logging.getLogger("zuul.Jenkins") log = logging.getLogger("zuul.Jenkins")
@ -134,8 +139,8 @@ class Jenkins(object):
self.callback_thread.start() self.callback_thread.start()
def launch(self, job, change, dependent_changes=[]): def launch(self, job, change, dependent_changes=[]):
self.log.info("Launch job %s for change %s with dependent changes %s" % ( self.log.info("Launch job %s for change %s with dependent changes %s" %
job, change, dependent_changes)) (job, change, dependent_changes))
uuid = str(uuid1()) uuid = str(uuid1())
changes_str = '^'.join( changes_str = '^'.join(
['%s:%s:%s' % (c.project.name, c.branch, c.refspec) ['%s:%s:%s' % (c.project.name, c.branch, c.refspec)
@ -146,13 +151,15 @@ class Jenkins(object):
GERRIT_CHANGES=changes_str) GERRIT_CHANGES=changes_str)
build = Build(job, uuid) build = Build(job, uuid)
self.builds[uuid] = build self.builds[uuid] = build
# We can get the started notification on another thread before this is done # We can get the started notification on another thread before
# so we add the build even before we trigger the job on Jenkins. We should # this is done so we add the build even before we trigger the
# be careful to clean it up if it doesn't actually kick off. # job on Jenkins. We should be careful to clean it up if it
# doesn't actually kick off.
try: try:
self.jenkins.build_job(job.name, parameters=params) self.jenkins.build_job(job.name, parameters=params)
except: except:
self.log.exception("Exception launching build %s for job %s for change %s:" % ( self.log.exception(
"Exception launching build %s for job %s for change %s:" % (
build, job, change)) build, job, change))
# Whoops. Remove that build we added. # Whoops. Remove that build we added.
del self.builds[uuid] del self.builds[uuid]
@ -171,32 +178,35 @@ class Jenkins(object):
self.log.debug("Looking for build %s in queue" % build) self.log.debug("Looking for build %s in queue" % build)
for item in self.jenkins.get_queue_info(): for item in self.jenkins.get_queue_info():
if not item.has_key('actions'): if 'actions' not in item:
continue continue
for action in item['actions']: for action in item['actions']:
if not action.has_key('parameters'): if 'parameters' not in action:
continue continue
parameters = action['parameters'] parameters = action['parameters']
for param in parameters: for param in parameters:
if (param['name'] == 'UUID' and build.uuid == param['value']): if (param['name'] == 'UUID' and
build.uuid == param['value']):
self.log.debug("Found queue item %s for build %s" % ( self.log.debug("Found queue item %s for build %s" % (
item['id'], build)) item['id'], build))
try: try:
self.jenkins.cancel_queue(item['id']) self.jenkins.cancel_queue(item['id'])
self.log.debug("Canceled queue item %s for build %s" % ( self.log.debug(
"Canceled queue item %s for build %s" % (
item['id'], build)) item['id'], build))
return return
except: except:
self.log.exception("Exception canceling queue item %s for build %s" % ( self.log.exception("Exception canceling queue \
item['id'], build)) item %s for build %s" % (item['id'], build))
self.log.debug("Still unable to find build %s to cancel" % build) self.log.debug("Still unable to find build %s to cancel" % build)
if build.number: if build.number:
self.log.debug("Build %s has just started" % build) self.log.debug("Build %s has just started" % build)
self.jenkins.stop_build(build.job.name, build.number) self.jenkins.stop_build(build.job.name, build.number)
self.log.debug("Canceled just running build %s" % build) self.log.debug("Canceled just running build %s" % build)
else: else:
self.log.error("Build %s has not started but was not found in queue" % build) self.log.error(
"Build %s has not started but was not found in queue" %
build)
def onBuildCompleted(self, uuid, status, url, number): def onBuildCompleted(self, uuid, status, url, number):
self.log.info("Build %s #%s complete, status %s" % ( self.log.info("Build %s #%s complete, status %s" % (

6
zuul/lib/gerrit.py
View File

@ -1,3 +1,4 @@
# Copyright 2011 OpenStack, LLC.
# Copyright 2012 Hewlett-Packard Development Company, L.P. # Copyright 2012 Hewlett-Packard Development Company, L.P.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # Licensed under the Apache License, Version 2.0 (the "License"); you may
@ -24,6 +25,7 @@ import pprint
# TODO: switch this to paramiko? # TODO: switch this to paramiko?
class GerritWatcher(threading.Thread): class GerritWatcher(threading.Thread):
log = logging.getLogger("gerrit.GerritWatcher") log = logging.getLogger("gerrit.GerritWatcher")
@ -67,7 +69,8 @@ class GerritWatcher(threading.Thread):
def _read(self): def _read(self):
l = self.proc.stdout.readline() l = self.proc.stdout.readline()
data = json.loads(l) data = json.loads(l)
self.log.debug("Received data from Gerrit event stream: \n%s" % pprint.pformat(data)) self.log.debug("Received data from Gerrit event stream: \n%s" %
pprint.pformat(data))
self.gerrit.addEvent(data) self.gerrit.addEvent(data)
def _listen(self): def _listen(self):
@ -94,6 +97,7 @@ class GerritWatcher(threading.Thread):
while True: while True:
self._run() self._run()
class Gerrit(object): class Gerrit(object):
log = logging.getLogger("gerrit.Gerrit") log = logging.getLogger("gerrit.Gerrit")

21
zuul/model.py
View File

@ -14,6 +14,7 @@
import re import re
class ChangeQueue(object): class ChangeQueue(object):
def __init__(self, queue_name): def __init__(self, queue_name):
self.name = '' self.name = ''
@ -51,6 +52,7 @@ class ChangeQueue(object):
for project in other.projects: for project in other.projects:
self.addProject(project) self.addProject(project)
class Job(object): class Job(object):
def __init__(self, name): def __init__(self, name):
self.name = name self.name = name
@ -64,6 +66,7 @@ class Job(object):
def __repr__(self): def __repr__(self):
return '<Job %s>' % (self.name) return '<Job %s>' % (self.name)
class Build(object): class Build(object):
def __init__(self, job, uuid): def __init__(self, job, uuid):
self.job = job self.job = job
@ -75,6 +78,7 @@ class Build(object):
def __repr__(self): def __repr__(self):
return '<Build %s of %s>' % (self.uuid, self.job.name) return '<Build %s of %s>' % (self.uuid, self.job.name)
class JobTree(object): class JobTree(object):
""" A JobTree represents an instance of one Job, and holds JobTrees """ A JobTree represents an instance of one Job, and holds JobTrees
whose jobs should be run if that Job succeeds. A root node of a whose jobs should be run if that Job succeeds. A root node of a
@ -106,6 +110,7 @@ class JobTree(object):
return ret return ret
return None return None
class Project(object): class Project(object):
def __init__(self, name): def __init__(self, name):
self.name = name self.name = name
@ -122,7 +127,7 @@ class Project(object):
return self.job_trees[name] return self.job_trees[name]
def hasQueue(self, name): def hasQueue(self, name):
if self.job_trees.has_key(name): if name in self.job_trees:
return True return True
return False return False
@ -135,6 +140,7 @@ class Project(object):
return [] return []
return tree.getJobs() return tree.getJobs()
class Change(object): class Change(object):
def __init__(self, queue_name, project, branch, number, patchset, refspec): def __init__(self, queue_name, project, branch, number, patchset, refspec):
self.queue_name = queue_name self.queue_name = queue_name
@ -222,7 +228,7 @@ class Change(object):
def areAllJobsComplete(self): def areAllJobsComplete(self):
tree = self.project.getJobTreeForQueue(self.queue_name) tree = self.project.getJobTreeForQueue(self.queue_name)
for job in tree.getJobs(): for job in tree.getJobs():
if not self.jobs.has_key(job.name): if not job.name in self.jobs:
return False return False
return True return True
@ -236,6 +242,7 @@ class Change(object):
if self.change_behind: if self.change_behind:
self.change_behind.change_ahead = None self.change_behind.change_ahead = None
class TriggerEvent(object): class TriggerEvent(object):
def __init__(self): def __init__(self):
self.data = None self.data = None
@ -256,11 +263,13 @@ class TriggerEvent(object):
if self.change_number: if self.change_number:
ret += " %s,%s" % (self.change_number, self.patch_number) ret += " %s,%s" % (self.change_number, self.patch_number)
if self.approvals: if self.approvals:
ret += ' '+', '.join(['%s:%s' % (a['type'], a['value']) for a in self.approvals]) ret += ' ' + ', '.join(
['%s:%s' % (a['type'], a['value']) for a in self.approvals])
ret += '>' ret += '>'
return ret return ret
class EventFilter(object): class EventFilter(object):
def __init__(self, types=[], branches=[], refs=[], approvals=[]): def __init__(self, types=[], branches=[], refs=[], approvals=[]):
self._types = types self._types = types
@ -281,7 +290,8 @@ class EventFilter(object):
if self._refs: if self._refs:
ret += ' refs: %s' % ', '.join(self._refs) ret += ' refs: %s' % ', '.join(self._refs)
if self.approvals: if self.approvals:
ret += ' approvals: %s' % ', '.join(['%s:%s' % a for a in self.approvals.items()]) ret += ' approvals: %s' % ', '.join(
['%s:%s' % a for a in self.approvals.items()])
ret += '>' ret += '>'
return ret return ret
@ -322,5 +332,6 @@ class EventFilter(object):
if (normalizeCategory(eapproval['description']) == category and if (normalizeCategory(eapproval['description']) == category and
int(eapproval['value']) == int(value)): int(eapproval['value']) == int(value)):
matches_approval = True matches_approval = True
if not matches_approval: return False if not matches_approval:
return False
return True return True

62
zuul/scheduler.py
View File

@ -18,9 +18,9 @@ import threading
import logging import logging
import yaml import yaml
from model import Job, Change, Project, ChangeQueue, EventFilter from model import Job, Change, Project, ChangeQueue, EventFilter
class Scheduler(object): class Scheduler(object):
log = logging.getLogger("zuul.Scheduler") log = logging.getLogger("zuul.Scheduler")
@ -39,7 +39,8 @@ class Scheduler(object):
def _parseConfig(self, fp): def _parseConfig(self, fp):
def toList(item): def toList(item):
if not item: return [] if not item:
return []
if type(item) == type([]): if type(item) == type([]):
return item return item
return [item] return [item]
@ -50,11 +51,10 @@ class Scheduler(object):
raise Exception("Unable to read layout config file at %s" % fp) raise Exception("Unable to read layout config file at %s" % fp)
fp = open(fp) fp = open(fp)
data = yaml.load(fp) data = yaml.load(fp)
import pprint
pprint.pprint(data)
for config_queue in data['queue']: for config_queue in data['queue']:
manager = globals()[config_queue['manager']](self, config_queue['name']) manager = globals()[config_queue['manager']](self,
config_queue['name'])
self.queue_managers[config_queue['name']] = manager self.queue_managers[config_queue['name']] = manager
manager.success_action = config_queue.get('success') manager.success_action = config_queue.get('success')
manager.failure_action = config_queue.get('failure') manager.failure_action = config_queue.get('failure')
@ -97,20 +97,18 @@ class Scheduler(object):
project = Project(config_project['name']) project = Project(config_project['name'])
self.projects[config_project['name']] = project self.projects[config_project['name']] = project
for qname in self.queue_managers.keys(): for qname in self.queue_managers.keys():
if config_project.has_key(qname): if qname in config_project:
print project, qname
job_tree = project.addQueue(qname) job_tree = project.addQueue(qname)
config_jobs = config_project[qname] config_jobs = config_project[qname]
add_jobs(job_tree, config_jobs) add_jobs(job_tree, config_jobs)
# TODO(jeblair): check that we don't end up with jobs like # TODO(jeblair): check that we don't end up with jobs like
# "foo - bar" because a ':' is missing in the yaml for a dependent job # "foo - bar" because a ':' is missing in the yaml for a dependent job
for manager in self.queue_managers.values(): for manager in self.queue_managers.values():
manager._postConfig() manager._postConfig()
def getJob(self, name): def getJob(self, name):
if self.jobs.has_key(name): if name in self.jobs:
return self.jobs[name] return self.jobs[name]
job = Job(name) job = Job(name)
self.jobs[name] = job self.jobs[name] = job
@ -175,6 +173,7 @@ class Scheduler(object):
if manager.onBuildCompleted(build): if manager.onBuildCompleted(build):
return return
class BaseQueueManager(object): class BaseQueueManager(object):
log = logging.getLogger("zuul.BaseQueueManager") log = logging.getLogger("zuul.BaseQueueManager")
@ -195,6 +194,7 @@ class BaseQueueManager(object):
for e in self.event_filters: for e in self.event_filters:
self.log.info(" %s" % e) self.log.info(" %s" % e)
self.log.info(" Projects:") self.log.info(" Projects:")
def log_jobs(tree, indent=0): def log_jobs(tree, indent=0):
istr = ' ' + ' ' * indent istr = ' ' + ' ' * indent
if tree.job: if tree.job:
@ -206,6 +206,7 @@ class BaseQueueManager(object):
self.log.info("%s%s%s" % (istr, repr(tree.job), efilters)) self.log.info("%s%s%s" % (istr, repr(tree.job), efilters))
for x in tree.job_trees: for x in tree.job_trees:
log_jobs(x, indent + 2) log_jobs(x, indent + 2)
for p in self.sched.projects.values(): for p in self.sched.projects.values():
if p.hasQueue(self.name): if p.hasQueue(self.name):
self.log.info(" %s" % p) self.log.info(" %s" % p)
@ -217,15 +218,12 @@ class BaseQueueManager(object):
self.log.info(" On failure:") self.log.info(" On failure:")
self.log.info(" %s" % self.failure_action) self.log.info(" %s" % self.failure_action)
def eventMatches(self, event): def eventMatches(self, event):
for ef in self.event_filters: for ef in self.event_filters:
print ef
if ef.matches(event): if ef.matches(event):
return True return True
return False return False
def addChange(self, change): def addChange(self, change):
self.log.debug("Adding change %s" % change) self.log.debug("Adding change %s" % change)
self.launchJobs(change) self.launchJobs(change)
@ -241,12 +239,12 @@ class BaseQueueManager(object):
build, job, change)) build, job, change))
change.addBuild(build) change.addBuild(build)
except: except:
self.log.exception("Exception while launching job %s for change %s:" % ( self.log.exception("Exception while launching job %s \
job, change)) for change %s:" % (job, change))
def onBuildCompleted(self, build): def onBuildCompleted(self, build):
self.log.debug("Build %s completed" % build) self.log.debug("Build %s completed" % build)
if not self.building_jobs.has_key(build): if build not in self.building_jobs:
self.log.warning("Build %s not found (may have been canceled)" % ( self.log.warning("Build %s not found (may have been canceled)" % (
build)) build))
# Or triggered externally, or triggered before zuul started, # Or triggered externally, or triggered before zuul started,
@ -291,15 +289,16 @@ class BaseQueueManager(object):
if ret: if ret:
self.log.error("Reporting change %s received: %s" % ( self.log.error("Reporting change %s received: %s" % (
change, ret)) change, ret))
print ret
except: except:
self.log.exception("Exception while reporting:") self.log.exception("Exception while reporting:")
return ret return ret
class IndependentQueueManager(BaseQueueManager): class IndependentQueueManager(BaseQueueManager):
log = logging.getLogger("zuul.IndependentQueueManager") log = logging.getLogger("zuul.IndependentQueueManager")
pass pass
class DependentQueueManager(BaseQueueManager): class DependentQueueManager(BaseQueueManager):
log = logging.getLogger("zuul.DependentQueueManager") log = logging.getLogger("zuul.DependentQueueManager")
@ -375,8 +374,8 @@ class DependentQueueManager(BaseQueueManager):
build, job, change)) build, job, change))
change.addBuild(build) change.addBuild(build)
except: except:
self.log.exception("Exception while launching job %s for change %s:" % ( self.log.exception("Exception while launching job %s \
job, change)) for change %s:" % (job, change))
if change.change_behind: if change.change_behind:
self.log.debug("Launching jobs for change %s, behind change %s" % ( self.log.debug("Launching jobs for change %s, behind change %s" % (
change.change_behind, change)) change.change_behind, change))
@ -393,22 +392,22 @@ class DependentQueueManager(BaseQueueManager):
try: try:
self.sched.launcher.cancel(build) self.sched.launcher.cancel(build)
except: except:
self.log.exception("Exception while canceling build %s for change %s" % ( self.log.exception("Exception while canceling build %s \
build, change)) for change %s" % (build, change))
to_remove.append(build) to_remove.append(build)
for build in to_remove: for build in to_remove:
self.log.debug("Removing build %s from running builds" % build) self.log.debug("Removing build %s from running builds" % build)
del self.building_jobs[build] del self.building_jobs[build]
if change.change_behind: if change.change_behind:
self.log.debug("Canceling jobs for change %s, behind change %s" % ( self.log.debug("Canceling jobs for change %s, \
change.change_behind, change)) behind change %s" % (change.change_behind, change))
self.cancelJobs(change.change_behind) self.cancelJobs(change.change_behind)
def possiblyReportChange(self, change): def possiblyReportChange(self, change):
self.log.debug("Possibly reporting change %s" % change) self.log.debug("Possibly reporting change %s" % change)
if not change.change_ahead: if not change.change_ahead:
self.log.debug("Change %s is at the front of the queue, reporting" % ( self.log.debug("Change %s is at the front of the queue, \
change)) reporting" % (change))
ret = self.reportChange(change) ret = self.reportChange(change)
self.log.debug("Removing reported change %s from queue" % change) self.log.debug("Removing reported change %s from queue" % change)
change.delete() change.delete()
@ -417,21 +416,22 @@ class DependentQueueManager(BaseQueueManager):
if merged: if merged:
merged = self.sched.trigger.isMerged(change) merged = self.sched.trigger.isMerged(change)
succeeded = change.didAllJobsSucceed() succeeded = change.didAllJobsSucceed()
self.log.info("Reported change %s status: all-succeeded: %s, merged: %s" % ( self.log.info("Reported change %s status: all-succeeded: %s, \
change, succeeded, merged)) merged: %s" % (change, succeeded, merged))
if not (succeeded and merged): if not (succeeded and merged):
self.log.debug("Reported change %s failed tests or failed to merge" % ( self.log.debug("Reported change %s failed tests or failed \
change)) to merge" % (change))
# The merge or test failed, re-run all jobs behind this one # The merge or test failed, re-run all jobs behind this one
if change.change_behind: if change.change_behind:
self.log.info("Canceling/relaunching jobs for change %s behind failed change %s" % ( self.log.info("Canceling/relaunching jobs for change %s \
behind failed change %s" % (
change.change_behind, change)) change.change_behind, change))
self.cancelJobs(change.change_behind) self.cancelJobs(change.change_behind)
self.launchJobs(change.change_behind) self.launchJobs(change.change_behind)
# If the change behind this is ready, notify # If the change behind this is ready, notify
if (change.change_behind and if (change.change_behind and
change.change_behind.areAllJobsComplete()): change.change_behind.areAllJobsComplete()):
self.log.info("Change %s behind change %s is ready, possibly reporting" % ( self.log.info("Change %s behind change %s is ready, \
change.change_behind, change)) possibly reporting" % (change.change_behind, change))
self.possiblyReportChange(change.change_behind) self.possiblyReportChange(change.change_behind)

6
zuul/trigger/gerrit.py
View File

@ -17,6 +17,7 @@ import logging
from zuul.lib import gerrit from zuul.lib import gerrit
from zuul.model import TriggerEvent from zuul.model import TriggerEvent
class GerritEventConnector(threading.Thread): class GerritEventConnector(threading.Thread):
"""Move events from Gerrit to the scheduler.""" """Move events from Gerrit to the scheduler."""
@ -27,7 +28,6 @@ class GerritEventConnector(threading.Thread):
self.gerrit = gerrit self.gerrit = gerrit
self.sched = sched self.sched = sched
def _handleEvent(self): def _handleEvent(self):
data = self.gerrit.getEvent() data = self.gerrit.getEvent()
event = TriggerEvent() event = TriggerEvent()
@ -44,7 +44,6 @@ class GerritEventConnector(threading.Thread):
event.approvals = data.get('approvals') event.approvals = data.get('approvals')
self.sched.addEvent(event) self.sched.addEvent(event)
def run(self): def run(self):
while True: while True:
try: try:
@ -70,7 +69,6 @@ class Gerrit(object):
self.gerrit, sched) self.gerrit, sched)
self.gerrit_connector.start() self.gerrit_connector.start()
def report(self, change, message, action): def report(self, change, message, action):
self.log.debug("Report change %s, action %s, message: %s" % self.log.debug("Report change %s, action %s, message: %s" %
(change, action, message)) (change, action, message))
@ -78,7 +76,6 @@ class Gerrit(object):
return self.gerrit.review(change.project.name, changeid, return self.gerrit.review(change.project.name, changeid,
message, action) message, action)
def isMerged(self, change): def isMerged(self, change):
self.log.debug("Checking if change %s is merged", change) self.log.debug("Checking if change %s is merged", change)
data = self.gerrit.query(change.number) data = self.gerrit.query(change.number)
@ -90,4 +87,3 @@ class Gerrit(object):
self.log.debug("Change %s status: %s" % (change, status)) self.log.debug("Change %s status: %s" % (change, status))
if status == 'MERGED' or status == 'SUBMITTED': if status == 'MERGED' or status == 'SUBMITTED':
return True return True