zuul
/
zuul
Code Issues Proposed changes

Merge "Remove unused merger:update task" into feature/zuulv3

This commit is contained in:
Jenkins 2017-05-20 17:21:35 +00:00 committed by Gerrit Code Review
parent e8827ff173 ba2f93c5a2
commit 9e958254bb
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zuul/merger/client.py
View File

@ -113,12 +113,6 @@ class MergeClient(object):
files=files)
self.submitJob('merger:merge', data, build_set, precedence)
def updateRepo(self, connection_name, project_name, build_set,
precedence=zuul.model.PRECEDENCE_NORMAL):
data = dict(connection=connection_name,
project=project_name)
self.submitJob('merger:update', data, build_set, precedence)
def getFiles(self, connection_name, project_name, branch, files,
precedence=zuul.model.PRECEDENCE_HIGH):
data = dict(connection=connection_name,

11
zuul/merger/server.py
View File

@ -67,7 +67,6 @@ class MergeServer(object):
def register(self):
self.worker.registerFunction("merger:merge")
self.worker.registerFunction("merger:update")
self.worker.registerFunction("merger:cat")
def stop(self):
@ -88,9 +87,6 @@ class MergeServer(object):
if job.name == 'merger:merge':
self.log.debug("Got merge job: %s" % job.unique)
self.merge(job)
elif job.name == 'merger:update':
self.log.debug("Got update job: %s" % job.unique)
self.update(job)
elif job.name == 'merger:cat':
self.log.debug("Got cat job: %s" % job.unique)
self.cat(job)
@ -119,13 +115,6 @@ class MergeServer(object):
result['commit'] = ret
job.sendWorkComplete(json.dumps(result))
def update(self, job):
args = json.loads(job.arguments)
self.merger.updateRepo(args['connection'], args['project'])
result = dict(updated=True,
zuul_url=self.zuul_url)
job.sendWorkComplete(json.dumps(result))
def cat(self, job):
args = json.loads(job.arguments)
self.merger.updateRepo(args['connection'], args['project'])