diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-05-20 17:21:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-05-20 17:21:35 +0000 |
| commit | 9e958254bb2c74313f12c62f97eadb13cb7cc8a5 (patch) | |
| tree | a6f0b89941acf18438ec084b5984257a2c4486df /zuul/merger | |
| parent | e8827ff17358669f9311b9aad5fddfa7895ef8ea (diff) | |
| parent | ba2f93c5a2e53610f85846cc147ca241e4ed5db6 (diff) | |
| download | zuul-9e958254bb2c74313f12c62f97eadb13cb7cc8a5.tar.gz | |
Merge "Remove unused merger:update task" into feature/zuulv3
Diffstat (limited to 'zuul/merger')
| -rw-r--r-- | zuul/merger/client.py | 6 | ||||
| -rw-r--r-- | zuul/merger/server.py | 11 |
2 files changed, 0 insertions, 17 deletions
diff --git a/zuul/merger/client.py b/zuul/merger/client.py index 069cbf5a7..e16419541 100644 --- a/zuul/merger/client.py +++ b/zuul/merger/client.py @@ -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, diff --git a/zuul/merger/server.py b/zuul/merger/server.py index 04fd03b17..c09d7ba5e 100644 --- a/zuul/merger/server.py +++ b/zuul/merger/server.py @@ -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']) |