summaryrefslogtreecommitdiff
path: root/zuul/trigger
diff options
context:
space:
mode:
authorJames E. Blair <jeblair@openstack.org>2014-01-28 12:42:20 -0800
committerJames E. Blair <jeblair@openstack.org>2014-02-17 11:47:15 -0800
commit4076e2b432992b71873b659649e35f0e665ab3ba (patch)
treed53bff4addb11e6c354bbfad8f81c7e36edd8de9 /zuul/trigger
parenta84f0e41792159b37c4114959199c525c28b5001 (diff)
downloadzuul-4076e2b432992b71873b659649e35f0e665ab3ba.tar.gz
Split the merger into a separate process
Connect it to Zuul via Gearman. Any number of mergers may be deployed. Directly find the pipeline for a build when processing a result, so that the procedure is roughly the same for build and merge results. The timer trigger currently requires the gerrit trigger also be configured. Make that explicit inside of the timer trigger so that the scheduler API interaction with triggers is cleaner. Change-Id: I69498813764753c97c426e42d17596c2ef1d87cf
Diffstat (limited to 'zuul/trigger')
-rw-r--r--zuul/trigger/timer.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/zuul/trigger/timer.py b/zuul/trigger/timer.py
index f055a5032..904fa7a08 100644
--- a/zuul/trigger/timer.py
+++ b/zuul/trigger/timer.py
@@ -86,7 +86,8 @@ class Timer(object):
raise Exception("Timer trigger does not support changes.")
def getGitUrl(self, project):
- pass
+ # For the moment, the timer trigger requires gerrit.
+ return self.sched.triggers['gerrit'].getGitUrl(project)
def getGitwebUrl(self, project, sha=None):
url = '%s/gitweb?p=%s.git' % (self.baseurl, project)